From 68ecd7e31d872df7e1426401ffc480545b8cae85 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 14 Oct 2021 15:08:19 -0400
Subject: [PATCH 01/38] basic code generation template, but not able to import
 to tool app

create new public class under chip/clusterinfo
---
 .../CHIPTool/.idea/jarRepositories.xml        |    5 +
 src/android/CHIPTool/.idea/misc.xml           |    2 +-
 .../ClusterInteractionFragment.kt             |    1 +
 src/controller/java/BUILD.gn                  |    4 +
 .../src/chip/clusterinfo/ClusterInfo.java     |   16 +
 .../src/chip/clusterinfo/CommandInfo.java     |   20 +
 .../chip/clusterinfo/CommandParameter.java    |   13 +
 .../src/chip/clusterinfo/ParameterType.java   |    5 +
 .../java/templates/ClusterInfo-java.zapt      |   38 +
 src/controller/java/templates/templates.json  |    5 +
 .../chip/devicecontroller/ChipClusters.java   |   61 +
 .../chip/devicecontroller/ClusterInfo.java    | 2139 +++++++++++++++++
 12 files changed, 2308 insertions(+), 1 deletion(-)
 create mode 100644 src/controller/java/src/chip/clusterinfo/CommandParameter.java
 create mode 100644 src/controller/java/src/chip/clusterinfo/ParameterType.java
 create mode 100644 src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java

diff --git a/src/android/CHIPTool/.idea/jarRepositories.xml b/src/android/CHIPTool/.idea/jarRepositories.xml
index a5f05cd8c87d4a..e34606ccde7a9d 100644
--- a/src/android/CHIPTool/.idea/jarRepositories.xml
+++ b/src/android/CHIPTool/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/.idea/misc.xml b/src/android/CHIPTool/.idea/misc.xml
index 37a750962da6f2..1b6dac9046a121 100644
--- a/src/android/CHIPTool/.idea/misc.xml
+++ b/src/android/CHIPTool/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index 96d171b9333ea9..2b05e7815aecf7 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -23,6 +23,7 @@ import java.lang.Exception
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 
+
 class ClusterInteractionFragment : Fragment() {
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 6bd724813d9ae8..784271dbd97cde 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -70,7 +70,11 @@ android_library("java") {
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
+<<<<<<< HEAD
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
+=======
+    "zap-generated/chip/devicecontroller/ClusterInfo.java",
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index f90a9b8e409b1b..9df3365b36a62c 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package chip.clusterinfo;
 
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
@@ -31,3 +32,18 @@ public interface ClusterConstructor {
     BaseChipCluster create(Long devicePtr, int endpointId);
   }
 }
+=======
+package chip.devicecontroller;
+
+public class ClusterInfo {
+
+  public ClusterInfo(String name) {
+    this.name = name;
+    this.commands = new ArrayList<CommandInfo>();
+  }
+  public String name;
+  public Class<T> clusterClass;
+  public List<CommandInfo> commands;
+
+}
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 7bc59c1571ff88..3a147273f073ca 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package chip.clusterinfo;
 
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
@@ -47,3 +48,22 @@ void invokeCommand(
         BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
 }
+=======
+package chip.devicecontroller;
+
+
+public class CommandInfo {
+  public CommandInfo(String name, Function<List<CommandParameter>, ClusterResponse> fn, List<CommandParameter> parameters, Class callbackClass) {
+    this.name = name;
+    this.fn = fn;
+    this.parameters = parameters;
+    this.callbackClass = callbackClass;
+  }
+  public CommandInfo() {}
+
+  public String name;
+  public Function<List<CommandParameter>, ClusterResponse> fn;
+  public List<CommandParameter> parameters;
+  public Class callbackClass;
+}
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameter.java b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
new file mode 100644
index 00000000000000..053dd80f55291c
--- /dev/null
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
@@ -0,0 +1,13 @@
+package chip.devicecontroller;
+
+public class CommandParameter {
+  public CommandParameter() {}
+
+  public CommandParameter(String name, ParameterType type) {
+    this.name = name;
+    this.type = type;
+  }
+
+  public String name;
+  public ParameterType type;
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/ParameterType.java b/src/controller/java/src/chip/clusterinfo/ParameterType.java
new file mode 100644
index 00000000000000..2b31ea19fd4ca7
--- /dev/null
+++ b/src/controller/java/src/chip/clusterinfo/ParameterType.java
@@ -0,0 +1,5 @@
+package chip.devicecontroller;
+
+enum ParameterType {
+  CALLBACK, INT, LONG, BOOLEAN, STRUCT
+}
\ No newline at end of file
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index dc253bea6e1c82..8675b61b7d9bf6 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -3,6 +3,7 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -147,6 +148,43 @@ public class ClusterInfoMapping {
      clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
      {{/chip_client_clusters}}
      return clusterMap;
+=======
+import java.util.List;
+
+public class ClusterInfoMapping {
+
+ public Map<String, ClusterInfo> getClusterMap() {
+     Map<String, ClusterInfo> clusterInfoMapping = new Hashmap<>();
+     {{#chip_client_clusters}}
+     ClusterInfo {{asLowerCamelCase name}}_clusterInfo = new ClusterInfo("{{asLowerCamelCase name}}");
+     {{#chip_cluster_commands}}
+           List<CommandParameter> {{asLowerCamelCase name}}_parametersList = new ArrayList<>();
+           CommandInfo {{asLowerCamelCase name}}_commandInfo = new CommandInfo();
+           {{asLowerCamelCase name}}_commandInfo.name = "{{asLowerCamelCase name}}";
+           {{#if (zcl_command_arguments_count this.id)}}
+               {{#if hasSpecificResponse}}
+                 {{asLowerCamelCase ../name}}_commandInfo.callbackClass = {{asUpperCamelCase responseName}}Callback.class;
+               {{else}}
+                 {{asLowerCamelCase ../name}}_commandInfo.callbackClass = DefaultClusterCallback.class;
+               {{/if}}
+               {{#chip_cluster_command_arguments}}
+                 CommandParameter {{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+                 {{asLowerCamelCase ../name}}_parametersList.add({{asLowerCamelCase label}}_commandParameter);
+                 {{#not_last}} {{/not_last}}
+               {{/chip_cluster_command_arguments}}
+           {{else}}
+             {{#if hasSpecificResponse}}
+               {{asLowerCamelCase ../name}}_commandInfo.callbackClass = {{asUpperCamelCase responseName}}Callback.class;
+             {{else}}
+               {{asLowerCamelCase ../name}}_commandInfo.callbackClass = DefaultClusterCallback.class;
+             {{/if}}
+           {{/if}}
+           {{asLowerCamelCase name}}_commandInfo.parameters = {{asLowerCamelCase name}}_parametersList;
+           {{asLowerCamelCase ../name}}_clusterInfo.commands.add({{asLowerCamelCase name}}_commandInfo);
+     {{/chip_cluster_commands}}
+     clusterInfoMapping.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}_clusterInfo);
+     {{/chip_client_clusters}}
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
   }
 }
 
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index 16bbc720ab17aa..57bf0a5d6eb8bd 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -38,8 +38,13 @@
         },
         {
             "path": "ClusterInfo-java.zapt",
+<<<<<<< HEAD
             "name": "Cluster information mapping for Java",
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
+=======
+            "name": "ClusterInfo Maping for Java",
+            "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java"
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
         }
     ]
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index fb8376fc6499d3..510745f0313773 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -3695,6 +3695,8 @@ public void reportCurrentLevelAttribute(IntegerAttributeCallback callback) {
       reportCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
@@ -3776,18 +3778,31 @@ public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, i
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
     private native void readCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
     private native void subscribeCurrentLevelAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
     private native void reportCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
     private native void readRemainingTimeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -3850,6 +3865,17 @@ private native void writeStartUpCurrentLevelAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void reportCurrentLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
   }
 
   public static class LowPowerCluster extends BaseChipCluster {
@@ -5944,10 +5970,15 @@ public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1
       testAddArguments(chipClusterPtr, callback, arg1, arg2);
     }
 
+<<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
     }
 
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
@@ -5961,7 +5992,11 @@ public void testListStructArgumentRequest(
         DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
       testListStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
+=======
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
     public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
@@ -5975,23 +6010,37 @@ public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
     public void testStructArgumentRequest(
         DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
       testStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
+=======
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
     public void testUnknownCommand(DefaultClusterCallback callback) {
       testUnknownCommand(chipClusterPtr, callback);
     }
 
     private native void test(long chipClusterPtr, DefaultClusterCallback callback);
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
     private native void testAddArguments(
         long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
 
+<<<<<<< HEAD
     private native void testEnumsRequest(
         long chipClusterPtr, TestEnumsResponseCallback callback, int arg1, int arg2);
 
+=======
+<<<<<<< HEAD
+>>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
     private native void testListInt8UArgumentRequest(
         long chipClusterPtr, DefaultClusterCallback callback, int arg1);
 
@@ -6008,12 +6057,19 @@ private native void testListStructArgumentRequest(
         String e,
         int f);
 
+=======
+    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
     private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
 
     private native void testNullableOptionalRequest(
         long chipClusterPtr, TestNullableOptionalResponseCallback callback, int arg1);
 
     private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
+<<<<<<< HEAD
+<<<<<<< HEAD
 
     private native void testStructArgumentRequest(
         long chipClusterPtr,
@@ -6025,6 +6081,11 @@ private native void testStructArgumentRequest(
         String e,
         int f);
 
+=======
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
     private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
 
     public interface TestAddArgumentsResponseCallback {
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java
new file mode 100644
index 00000000000000..0c578a6f5d3e65
--- /dev/null
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java
@@ -0,0 +1,2139 @@
+/*
+ *
+ *    Copyright (c) 2021 Project CHIP Authors
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+// THIS FILE IS GENERATED BY ZAP
+
+package chip.devicecontroller;
+
+import java.util.List;
+
+public class ClusterInfoMapping {
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterInfoMapping = new Hashmap<>();
+    ClusterInfo accountLogin_clusterInfo = new ClusterInfo("accountLogin");
+    List<CommandParameter> getSetupPIN_parametersList = new ArrayList<>();
+    CommandInfo getSetupPIN_commandInfo = new CommandInfo();
+    getSetupPIN_commandInfo.name = "getSetupPIN";
+    accountLogin_commandInfo.callbackClass = GetSetupPINResponseCallback.class;
+    CommandParameter tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    getSetupPIN_parametersList.add(tempAccountIdentifier_commandParameter);
+
+    getSetupPIN_commandInfo.parameters = getSetupPIN_parametersList;
+    accountLogin_clusterInfo.commands.add(getSetupPIN_commandInfo);
+    List<CommandParameter> login_parametersList = new ArrayList<>();
+    CommandInfo login_commandInfo = new CommandInfo();
+    login_commandInfo.name = "login";
+    accountLogin_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    login_parametersList.add(tempAccountIdentifier_commandParameter);
+
+    CommandParameter setupPIN_commandParameter = new CommandParameter("setupPIN", String.class);
+    login_parametersList.add(setupPIN_commandParameter);
+
+    login_commandInfo.parameters = login_parametersList;
+    accountLogin_clusterInfo.commands.add(login_commandInfo);
+    clusterInfoMapping.put("accountLogin", accountLogin_clusterInfo);
+    ClusterInfo administratorCommissioning_clusterInfo =
+        new ClusterInfo("administratorCommissioning");
+    List<CommandParameter> openBasicCommissioningWindow_parametersList = new ArrayList<>();
+    CommandInfo openBasicCommissioningWindow_commandInfo = new CommandInfo();
+    openBasicCommissioningWindow_commandInfo.name = "openBasicCommissioningWindow";
+    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    openBasicCommissioningWindow_parametersList.add(commissioningTimeout_commandParameter);
+
+    openBasicCommissioningWindow_commandInfo.parameters =
+        openBasicCommissioningWindow_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(openBasicCommissioningWindow_commandInfo);
+    List<CommandParameter> openCommissioningWindow_parametersList = new ArrayList<>();
+    CommandInfo openCommissioningWindow_commandInfo = new CommandInfo();
+    openCommissioningWindow_commandInfo.name = "openCommissioningWindow";
+    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    openCommissioningWindow_parametersList.add(commissioningTimeout_commandParameter);
+
+    CommandParameter PAKEVerifier_commandParameter =
+        new CommandParameter("PAKEVerifier", byte[].class);
+    openCommissioningWindow_parametersList.add(PAKEVerifier_commandParameter);
+
+    CommandParameter discriminator_commandParameter =
+        new CommandParameter("discriminator", int.class);
+    openCommissioningWindow_parametersList.add(discriminator_commandParameter);
+
+    CommandParameter iterations_commandParameter = new CommandParameter("iterations", long.class);
+    openCommissioningWindow_parametersList.add(iterations_commandParameter);
+
+    CommandParameter salt_commandParameter = new CommandParameter("salt", byte[].class);
+    openCommissioningWindow_parametersList.add(salt_commandParameter);
+
+    CommandParameter passcodeID_commandParameter = new CommandParameter("passcodeID", int.class);
+    openCommissioningWindow_parametersList.add(passcodeID_commandParameter);
+
+    openCommissioningWindow_commandInfo.parameters = openCommissioningWindow_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(openCommissioningWindow_commandInfo);
+    List<CommandParameter> revokeCommissioning_parametersList = new ArrayList<>();
+    CommandInfo revokeCommissioning_commandInfo = new CommandInfo();
+    revokeCommissioning_commandInfo.name = "revokeCommissioning";
+    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
+    revokeCommissioning_commandInfo.parameters = revokeCommissioning_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(revokeCommissioning_commandInfo);
+    clusterInfoMapping.put("administratorCommissioning", administratorCommissioning_clusterInfo);
+    ClusterInfo applicationBasic_clusterInfo = new ClusterInfo("applicationBasic");
+    List<CommandParameter> changeStatus_parametersList = new ArrayList<>();
+    CommandInfo changeStatus_commandInfo = new CommandInfo();
+    changeStatus_commandInfo.name = "changeStatus";
+    applicationBasic_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter status_commandParameter = new CommandParameter("status", int.class);
+    changeStatus_parametersList.add(status_commandParameter);
+
+    changeStatus_commandInfo.parameters = changeStatus_parametersList;
+    applicationBasic_clusterInfo.commands.add(changeStatus_commandInfo);
+    clusterInfoMapping.put("applicationBasic", applicationBasic_clusterInfo);
+    ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo("applicationLauncher");
+    List<CommandParameter> launchApp_parametersList = new ArrayList<>();
+    CommandInfo launchApp_commandInfo = new CommandInfo();
+    launchApp_commandInfo.name = "launchApp";
+    applicationLauncher_commandInfo.callbackClass = LaunchAppResponseCallback.class;
+    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
+    launchApp_parametersList.add(data_commandParameter);
+
+    CommandParameter catalogVendorId_commandParameter =
+        new CommandParameter("catalogVendorId", int.class);
+    launchApp_parametersList.add(catalogVendorId_commandParameter);
+
+    CommandParameter applicationId_commandParameter =
+        new CommandParameter("applicationId", String.class);
+    launchApp_parametersList.add(applicationId_commandParameter);
+
+    launchApp_commandInfo.parameters = launchApp_parametersList;
+    applicationLauncher_clusterInfo.commands.add(launchApp_commandInfo);
+    clusterInfoMapping.put("applicationLauncher", applicationLauncher_clusterInfo);
+    ClusterInfo audioOutput_clusterInfo = new ClusterInfo("audioOutput");
+    List<CommandParameter> renameOutput_parametersList = new ArrayList<>();
+    CommandInfo renameOutput_commandInfo = new CommandInfo();
+    renameOutput_commandInfo.name = "renameOutput";
+    audioOutput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
+    renameOutput_parametersList.add(index_commandParameter);
+
+    CommandParameter name_commandParameter = new CommandParameter("name", String.class);
+    renameOutput_parametersList.add(name_commandParameter);
+
+    renameOutput_commandInfo.parameters = renameOutput_parametersList;
+    audioOutput_clusterInfo.commands.add(renameOutput_commandInfo);
+    List<CommandParameter> selectOutput_parametersList = new ArrayList<>();
+    CommandInfo selectOutput_commandInfo = new CommandInfo();
+    selectOutput_commandInfo.name = "selectOutput";
+    audioOutput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
+    selectOutput_parametersList.add(index_commandParameter);
+
+    selectOutput_commandInfo.parameters = selectOutput_parametersList;
+    audioOutput_clusterInfo.commands.add(selectOutput_commandInfo);
+    clusterInfoMapping.put("audioOutput", audioOutput_clusterInfo);
+    ClusterInfo barrierControl_clusterInfo = new ClusterInfo("barrierControl");
+    List<CommandParameter> barrierControlGoToPercent_parametersList = new ArrayList<>();
+    CommandInfo barrierControlGoToPercent_commandInfo = new CommandInfo();
+    barrierControlGoToPercent_commandInfo.name = "barrierControlGoToPercent";
+    barrierControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter percentOpen_commandParameter = new CommandParameter("percentOpen", int.class);
+    barrierControlGoToPercent_parametersList.add(percentOpen_commandParameter);
+
+    barrierControlGoToPercent_commandInfo.parameters = barrierControlGoToPercent_parametersList;
+    barrierControl_clusterInfo.commands.add(barrierControlGoToPercent_commandInfo);
+    List<CommandParameter> barrierControlStop_parametersList = new ArrayList<>();
+    CommandInfo barrierControlStop_commandInfo = new CommandInfo();
+    barrierControlStop_commandInfo.name = "barrierControlStop";
+    barrierControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    barrierControlStop_commandInfo.parameters = barrierControlStop_parametersList;
+    barrierControl_clusterInfo.commands.add(barrierControlStop_commandInfo);
+    clusterInfoMapping.put("barrierControl", barrierControl_clusterInfo);
+    ClusterInfo basic_clusterInfo = new ClusterInfo("basic");
+    List<CommandParameter> mfgSpecificPing_parametersList = new ArrayList<>();
+    CommandInfo mfgSpecificPing_commandInfo = new CommandInfo();
+    mfgSpecificPing_commandInfo.name = "mfgSpecificPing";
+    basic_commandInfo.callbackClass = DefaultClusterCallback.class;
+    mfgSpecificPing_commandInfo.parameters = mfgSpecificPing_parametersList;
+    basic_clusterInfo.commands.add(mfgSpecificPing_commandInfo);
+    clusterInfoMapping.put("basic", basic_clusterInfo);
+    ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo("binaryInputBasic");
+    clusterInfoMapping.put("binaryInputBasic", binaryInputBasic_clusterInfo);
+    ClusterInfo binding_clusterInfo = new ClusterInfo("binding");
+    List<CommandParameter> bind_parametersList = new ArrayList<>();
+    CommandInfo bind_commandInfo = new CommandInfo();
+    bind_commandInfo.name = "bind";
+    binding_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+    bind_parametersList.add(nodeId_commandParameter);
+
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    bind_parametersList.add(groupId_commandParameter);
+
+    CommandParameter endpointId_commandParameter = new CommandParameter("endpointId", int.class);
+    bind_parametersList.add(endpointId_commandParameter);
+
+    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+    bind_parametersList.add(clusterId_commandParameter);
+
+    bind_commandInfo.parameters = bind_parametersList;
+    binding_clusterInfo.commands.add(bind_commandInfo);
+    List<CommandParameter> unbind_parametersList = new ArrayList<>();
+    CommandInfo unbind_commandInfo = new CommandInfo();
+    unbind_commandInfo.name = "unbind";
+    binding_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+    unbind_parametersList.add(nodeId_commandParameter);
+
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    unbind_parametersList.add(groupId_commandParameter);
+
+    CommandParameter endpointId_commandParameter = new CommandParameter("endpointId", int.class);
+    unbind_parametersList.add(endpointId_commandParameter);
+
+    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+    unbind_parametersList.add(clusterId_commandParameter);
+
+    unbind_commandInfo.parameters = unbind_parametersList;
+    binding_clusterInfo.commands.add(unbind_commandInfo);
+    clusterInfoMapping.put("binding", binding_clusterInfo);
+    ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo("bridgedDeviceBasic");
+    clusterInfoMapping.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
+    ClusterInfo colorControl_clusterInfo = new ClusterInfo("colorControl");
+    List<CommandParameter> colorLoopSet_parametersList = new ArrayList<>();
+    CommandInfo colorLoopSet_commandInfo = new CommandInfo();
+    colorLoopSet_commandInfo.name = "colorLoopSet";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter updateFlags_commandParameter = new CommandParameter("updateFlags", int.class);
+    colorLoopSet_parametersList.add(updateFlags_commandParameter);
+
+    CommandParameter action_commandParameter = new CommandParameter("action", int.class);
+    colorLoopSet_parametersList.add(action_commandParameter);
+
+    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
+    colorLoopSet_parametersList.add(direction_commandParameter);
+
+    CommandParameter time_commandParameter = new CommandParameter("time", int.class);
+    colorLoopSet_parametersList.add(time_commandParameter);
+
+    CommandParameter startHue_commandParameter = new CommandParameter("startHue", int.class);
+    colorLoopSet_parametersList.add(startHue_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    colorLoopSet_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorLoopSet_parametersList.add(optionsOverride_commandParameter);
+
+    colorLoopSet_commandInfo.parameters = colorLoopSet_parametersList;
+    colorControl_clusterInfo.commands.add(colorLoopSet_commandInfo);
+    List<CommandParameter> enhancedMoveHue_parametersList = new ArrayList<>();
+    CommandInfo enhancedMoveHue_commandInfo = new CommandInfo();
+    enhancedMoveHue_commandInfo.name = "enhancedMoveHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    enhancedMoveHue_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    enhancedMoveHue_parametersList.add(rate_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    enhancedMoveHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    enhancedMoveHue_parametersList.add(optionsOverride_commandParameter);
+
+    enhancedMoveHue_commandInfo.parameters = enhancedMoveHue_parametersList;
+    colorControl_clusterInfo.commands.add(enhancedMoveHue_commandInfo);
+    List<CommandParameter> enhancedMoveToHue_parametersList = new ArrayList<>();
+    CommandInfo enhancedMoveToHue_commandInfo = new CommandInfo();
+    enhancedMoveToHue_commandInfo.name = "enhancedMoveToHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
+    enhancedMoveToHue_parametersList.add(enhancedHue_commandParameter);
+
+    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
+    enhancedMoveToHue_parametersList.add(direction_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    enhancedMoveToHue_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    enhancedMoveToHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    enhancedMoveToHue_parametersList.add(optionsOverride_commandParameter);
+
+    enhancedMoveToHue_commandInfo.parameters = enhancedMoveToHue_parametersList;
+    colorControl_clusterInfo.commands.add(enhancedMoveToHue_commandInfo);
+    List<CommandParameter> enhancedMoveToHueAndSaturation_parametersList = new ArrayList<>();
+    CommandInfo enhancedMoveToHueAndSaturation_commandInfo = new CommandInfo();
+    enhancedMoveToHueAndSaturation_commandInfo.name = "enhancedMoveToHueAndSaturation";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
+    enhancedMoveToHueAndSaturation_parametersList.add(enhancedHue_commandParameter);
+
+    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
+    enhancedMoveToHueAndSaturation_parametersList.add(saturation_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    enhancedMoveToHueAndSaturation_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    enhancedMoveToHueAndSaturation_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    enhancedMoveToHueAndSaturation_parametersList.add(optionsOverride_commandParameter);
+
+    enhancedMoveToHueAndSaturation_commandInfo.parameters =
+        enhancedMoveToHueAndSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(enhancedMoveToHueAndSaturation_commandInfo);
+    List<CommandParameter> enhancedStepHue_parametersList = new ArrayList<>();
+    CommandInfo enhancedStepHue_commandInfo = new CommandInfo();
+    enhancedStepHue_commandInfo.name = "enhancedStepHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    enhancedStepHue_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    enhancedStepHue_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    enhancedStepHue_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    enhancedStepHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    enhancedStepHue_parametersList.add(optionsOverride_commandParameter);
+
+    enhancedStepHue_commandInfo.parameters = enhancedStepHue_parametersList;
+    colorControl_clusterInfo.commands.add(enhancedStepHue_commandInfo);
+    List<CommandParameter> moveColor_parametersList = new ArrayList<>();
+    CommandInfo moveColor_commandInfo = new CommandInfo();
+    moveColor_commandInfo.name = "moveColor";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter rateX_commandParameter = new CommandParameter("rateX", int.class);
+    moveColor_parametersList.add(rateX_commandParameter);
+
+    CommandParameter rateY_commandParameter = new CommandParameter("rateY", int.class);
+    moveColor_parametersList.add(rateY_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveColor_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveColor_parametersList.add(optionsOverride_commandParameter);
+
+    moveColor_commandInfo.parameters = moveColor_parametersList;
+    colorControl_clusterInfo.commands.add(moveColor_commandInfo);
+    List<CommandParameter> moveColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo moveColorTemperature_commandInfo = new CommandInfo();
+    moveColorTemperature_commandInfo.name = "moveColorTemperature";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    moveColorTemperature_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    moveColorTemperature_parametersList.add(rate_commandParameter);
+
+    CommandParameter colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    moveColorTemperature_parametersList.add(colorTemperatureMinimum_commandParameter);
+
+    CommandParameter colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    moveColorTemperature_parametersList.add(colorTemperatureMaximum_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveColorTemperature_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveColorTemperature_parametersList.add(optionsOverride_commandParameter);
+
+    moveColorTemperature_commandInfo.parameters = moveColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(moveColorTemperature_commandInfo);
+    List<CommandParameter> moveHue_parametersList = new ArrayList<>();
+    CommandInfo moveHue_commandInfo = new CommandInfo();
+    moveHue_commandInfo.name = "moveHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    moveHue_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    moveHue_parametersList.add(rate_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveHue_parametersList.add(optionsOverride_commandParameter);
+
+    moveHue_commandInfo.parameters = moveHue_parametersList;
+    colorControl_clusterInfo.commands.add(moveHue_commandInfo);
+    List<CommandParameter> moveSaturation_parametersList = new ArrayList<>();
+    CommandInfo moveSaturation_commandInfo = new CommandInfo();
+    moveSaturation_commandInfo.name = "moveSaturation";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    moveSaturation_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    moveSaturation_parametersList.add(rate_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveSaturation_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveSaturation_parametersList.add(optionsOverride_commandParameter);
+
+    moveSaturation_commandInfo.parameters = moveSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(moveSaturation_commandInfo);
+    List<CommandParameter> moveToColor_parametersList = new ArrayList<>();
+    CommandInfo moveToColor_commandInfo = new CommandInfo();
+    moveToColor_commandInfo.name = "moveToColor";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter colorX_commandParameter = new CommandParameter("colorX", int.class);
+    moveToColor_parametersList.add(colorX_commandParameter);
+
+    CommandParameter colorY_commandParameter = new CommandParameter("colorY", int.class);
+    moveToColor_parametersList.add(colorY_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToColor_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveToColor_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveToColor_parametersList.add(optionsOverride_commandParameter);
+
+    moveToColor_commandInfo.parameters = moveToColor_parametersList;
+    colorControl_clusterInfo.commands.add(moveToColor_commandInfo);
+    List<CommandParameter> moveToColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo moveToColorTemperature_commandInfo = new CommandInfo();
+    moveToColorTemperature_commandInfo.name = "moveToColorTemperature";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter colorTemperature_commandParameter =
+        new CommandParameter("colorTemperature", int.class);
+    moveToColorTemperature_parametersList.add(colorTemperature_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToColorTemperature_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveToColorTemperature_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveToColorTemperature_parametersList.add(optionsOverride_commandParameter);
+
+    moveToColorTemperature_commandInfo.parameters = moveToColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(moveToColorTemperature_commandInfo);
+    List<CommandParameter> moveToHue_parametersList = new ArrayList<>();
+    CommandInfo moveToHue_commandInfo = new CommandInfo();
+    moveToHue_commandInfo.name = "moveToHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter hue_commandParameter = new CommandParameter("hue", int.class);
+    moveToHue_parametersList.add(hue_commandParameter);
+
+    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
+    moveToHue_parametersList.add(direction_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToHue_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveToHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveToHue_parametersList.add(optionsOverride_commandParameter);
+
+    moveToHue_commandInfo.parameters = moveToHue_parametersList;
+    colorControl_clusterInfo.commands.add(moveToHue_commandInfo);
+    List<CommandParameter> moveToHueAndSaturation_parametersList = new ArrayList<>();
+    CommandInfo moveToHueAndSaturation_commandInfo = new CommandInfo();
+    moveToHueAndSaturation_commandInfo.name = "moveToHueAndSaturation";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter hue_commandParameter = new CommandParameter("hue", int.class);
+    moveToHueAndSaturation_parametersList.add(hue_commandParameter);
+
+    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
+    moveToHueAndSaturation_parametersList.add(saturation_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToHueAndSaturation_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveToHueAndSaturation_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveToHueAndSaturation_parametersList.add(optionsOverride_commandParameter);
+
+    moveToHueAndSaturation_commandInfo.parameters = moveToHueAndSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(moveToHueAndSaturation_commandInfo);
+    List<CommandParameter> moveToSaturation_parametersList = new ArrayList<>();
+    CommandInfo moveToSaturation_commandInfo = new CommandInfo();
+    moveToSaturation_commandInfo.name = "moveToSaturation";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
+    moveToSaturation_parametersList.add(saturation_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToSaturation_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    moveToSaturation_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    moveToSaturation_parametersList.add(optionsOverride_commandParameter);
+
+    moveToSaturation_commandInfo.parameters = moveToSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(moveToSaturation_commandInfo);
+    List<CommandParameter> stepColor_parametersList = new ArrayList<>();
+    CommandInfo stepColor_commandInfo = new CommandInfo();
+    stepColor_commandInfo.name = "stepColor";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepX_commandParameter = new CommandParameter("stepX", int.class);
+    stepColor_parametersList.add(stepX_commandParameter);
+
+    CommandParameter stepY_commandParameter = new CommandParameter("stepY", int.class);
+    stepColor_parametersList.add(stepY_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    stepColor_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    stepColor_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    stepColor_parametersList.add(optionsOverride_commandParameter);
+
+    stepColor_commandInfo.parameters = stepColor_parametersList;
+    colorControl_clusterInfo.commands.add(stepColor_commandInfo);
+    List<CommandParameter> stepColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo stepColorTemperature_commandInfo = new CommandInfo();
+    stepColorTemperature_commandInfo.name = "stepColorTemperature";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    stepColorTemperature_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    stepColorTemperature_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    stepColorTemperature_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    stepColorTemperature_parametersList.add(colorTemperatureMinimum_commandParameter);
+
+    CommandParameter colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    stepColorTemperature_parametersList.add(colorTemperatureMaximum_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    stepColorTemperature_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    stepColorTemperature_parametersList.add(optionsOverride_commandParameter);
+
+    stepColorTemperature_commandInfo.parameters = stepColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(stepColorTemperature_commandInfo);
+    List<CommandParameter> stepHue_parametersList = new ArrayList<>();
+    CommandInfo stepHue_commandInfo = new CommandInfo();
+    stepHue_commandInfo.name = "stepHue";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    stepHue_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    stepHue_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    stepHue_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    stepHue_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    stepHue_parametersList.add(optionsOverride_commandParameter);
+
+    stepHue_commandInfo.parameters = stepHue_parametersList;
+    colorControl_clusterInfo.commands.add(stepHue_commandInfo);
+    List<CommandParameter> stepSaturation_parametersList = new ArrayList<>();
+    CommandInfo stepSaturation_commandInfo = new CommandInfo();
+    stepSaturation_commandInfo.name = "stepSaturation";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    stepSaturation_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    stepSaturation_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    stepSaturation_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    stepSaturation_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    stepSaturation_parametersList.add(optionsOverride_commandParameter);
+
+    stepSaturation_commandInfo.parameters = stepSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(stepSaturation_commandInfo);
+    List<CommandParameter> stopMoveStep_parametersList = new ArrayList<>();
+    CommandInfo stopMoveStep_commandInfo = new CommandInfo();
+    stopMoveStep_commandInfo.name = "stopMoveStep";
+    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+    stopMoveStep_parametersList.add(optionsMask_commandParameter);
+
+    CommandParameter optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    stopMoveStep_parametersList.add(optionsOverride_commandParameter);
+
+    stopMoveStep_commandInfo.parameters = stopMoveStep_parametersList;
+    colorControl_clusterInfo.commands.add(stopMoveStep_commandInfo);
+    clusterInfoMapping.put("colorControl", colorControl_clusterInfo);
+    ClusterInfo contentLauncher_clusterInfo = new ClusterInfo("contentLauncher");
+    List<CommandParameter> launchContent_parametersList = new ArrayList<>();
+    CommandInfo launchContent_commandInfo = new CommandInfo();
+    launchContent_commandInfo.name = "launchContent";
+    contentLauncher_commandInfo.callbackClass = LaunchContentResponseCallback.class;
+    CommandParameter autoPlay_commandParameter = new CommandParameter("autoPlay", boolean.class);
+    launchContent_parametersList.add(autoPlay_commandParameter);
+
+    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
+    launchContent_parametersList.add(data_commandParameter);
+
+    launchContent_commandInfo.parameters = launchContent_parametersList;
+    contentLauncher_clusterInfo.commands.add(launchContent_commandInfo);
+    List<CommandParameter> launchURL_parametersList = new ArrayList<>();
+    CommandInfo launchURL_commandInfo = new CommandInfo();
+    launchURL_commandInfo.name = "launchURL";
+    contentLauncher_commandInfo.callbackClass = LaunchURLResponseCallback.class;
+    CommandParameter contentURL_commandParameter = new CommandParameter("contentURL", String.class);
+    launchURL_parametersList.add(contentURL_commandParameter);
+
+    CommandParameter displayString_commandParameter =
+        new CommandParameter("displayString", String.class);
+    launchURL_parametersList.add(displayString_commandParameter);
+
+    launchURL_commandInfo.parameters = launchURL_parametersList;
+    contentLauncher_clusterInfo.commands.add(launchURL_commandInfo);
+    clusterInfoMapping.put("contentLauncher", contentLauncher_clusterInfo);
+    ClusterInfo descriptor_clusterInfo = new ClusterInfo("descriptor");
+    clusterInfoMapping.put("descriptor", descriptor_clusterInfo);
+    ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo("diagnosticLogs");
+    List<CommandParameter> retrieveLogsRequest_parametersList = new ArrayList<>();
+    CommandInfo retrieveLogsRequest_commandInfo = new CommandInfo();
+    retrieveLogsRequest_commandInfo.name = "retrieveLogsRequest";
+    diagnosticLogs_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter intent_commandParameter = new CommandParameter("intent", int.class);
+    retrieveLogsRequest_parametersList.add(intent_commandParameter);
+
+    CommandParameter requestedProtocol_commandParameter =
+        new CommandParameter("requestedProtocol", int.class);
+    retrieveLogsRequest_parametersList.add(requestedProtocol_commandParameter);
+
+    CommandParameter transferFileDesignator_commandParameter =
+        new CommandParameter("transferFileDesignator", byte[].class);
+    retrieveLogsRequest_parametersList.add(transferFileDesignator_commandParameter);
+
+    retrieveLogsRequest_commandInfo.parameters = retrieveLogsRequest_parametersList;
+    diagnosticLogs_clusterInfo.commands.add(retrieveLogsRequest_commandInfo);
+    clusterInfoMapping.put("diagnosticLogs", diagnosticLogs_clusterInfo);
+    ClusterInfo doorLock_clusterInfo = new ClusterInfo("doorLock");
+    List<CommandParameter> clearAllPins_parametersList = new ArrayList<>();
+    CommandInfo clearAllPins_commandInfo = new CommandInfo();
+    clearAllPins_commandInfo.name = "clearAllPins";
+    doorLock_commandInfo.callbackClass = ClearAllPinsResponseCallback.class;
+    clearAllPins_commandInfo.parameters = clearAllPins_parametersList;
+    doorLock_clusterInfo.commands.add(clearAllPins_commandInfo);
+    List<CommandParameter> clearAllRfids_parametersList = new ArrayList<>();
+    CommandInfo clearAllRfids_commandInfo = new CommandInfo();
+    clearAllRfids_commandInfo.name = "clearAllRfids";
+    doorLock_commandInfo.callbackClass = ClearAllRfidsResponseCallback.class;
+    clearAllRfids_commandInfo.parameters = clearAllRfids_parametersList;
+    doorLock_clusterInfo.commands.add(clearAllRfids_commandInfo);
+    List<CommandParameter> clearHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo clearHolidaySchedule_commandInfo = new CommandInfo();
+    clearHolidaySchedule_commandInfo.name = "clearHolidaySchedule";
+    doorLock_commandInfo.callbackClass = ClearHolidayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    clearHolidaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    clearHolidaySchedule_commandInfo.parameters = clearHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(clearHolidaySchedule_commandInfo);
+    List<CommandParameter> clearPin_parametersList = new ArrayList<>();
+    CommandInfo clearPin_commandInfo = new CommandInfo();
+    clearPin_commandInfo.name = "clearPin";
+    doorLock_commandInfo.callbackClass = ClearPinResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    clearPin_parametersList.add(userId_commandParameter);
+
+    clearPin_commandInfo.parameters = clearPin_parametersList;
+    doorLock_clusterInfo.commands.add(clearPin_commandInfo);
+    List<CommandParameter> clearRfid_parametersList = new ArrayList<>();
+    CommandInfo clearRfid_commandInfo = new CommandInfo();
+    clearRfid_commandInfo.name = "clearRfid";
+    doorLock_commandInfo.callbackClass = ClearRfidResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    clearRfid_parametersList.add(userId_commandParameter);
+
+    clearRfid_commandInfo.parameters = clearRfid_parametersList;
+    doorLock_clusterInfo.commands.add(clearRfid_commandInfo);
+    List<CommandParameter> clearWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo clearWeekdaySchedule_commandInfo = new CommandInfo();
+    clearWeekdaySchedule_commandInfo.name = "clearWeekdaySchedule";
+    doorLock_commandInfo.callbackClass = ClearWeekdayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    clearWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    clearWeekdaySchedule_parametersList.add(userId_commandParameter);
+
+    clearWeekdaySchedule_commandInfo.parameters = clearWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(clearWeekdaySchedule_commandInfo);
+    List<CommandParameter> clearYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo clearYeardaySchedule_commandInfo = new CommandInfo();
+    clearYeardaySchedule_commandInfo.name = "clearYeardaySchedule";
+    doorLock_commandInfo.callbackClass = ClearYeardayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    clearYeardaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    clearYeardaySchedule_parametersList.add(userId_commandParameter);
+
+    clearYeardaySchedule_commandInfo.parameters = clearYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(clearYeardaySchedule_commandInfo);
+    List<CommandParameter> getHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo getHolidaySchedule_commandInfo = new CommandInfo();
+    getHolidaySchedule_commandInfo.name = "getHolidaySchedule";
+    doorLock_commandInfo.callbackClass = GetHolidayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    getHolidaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    getHolidaySchedule_commandInfo.parameters = getHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(getHolidaySchedule_commandInfo);
+    List<CommandParameter> getLogRecord_parametersList = new ArrayList<>();
+    CommandInfo getLogRecord_commandInfo = new CommandInfo();
+    getLogRecord_commandInfo.name = "getLogRecord";
+    doorLock_commandInfo.callbackClass = GetLogRecordResponseCallback.class;
+    CommandParameter logIndex_commandParameter = new CommandParameter("logIndex", int.class);
+    getLogRecord_parametersList.add(logIndex_commandParameter);
+
+    getLogRecord_commandInfo.parameters = getLogRecord_parametersList;
+    doorLock_clusterInfo.commands.add(getLogRecord_commandInfo);
+    List<CommandParameter> getPin_parametersList = new ArrayList<>();
+    CommandInfo getPin_commandInfo = new CommandInfo();
+    getPin_commandInfo.name = "getPin";
+    doorLock_commandInfo.callbackClass = GetPinResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    getPin_parametersList.add(userId_commandParameter);
+
+    getPin_commandInfo.parameters = getPin_parametersList;
+    doorLock_clusterInfo.commands.add(getPin_commandInfo);
+    List<CommandParameter> getRfid_parametersList = new ArrayList<>();
+    CommandInfo getRfid_commandInfo = new CommandInfo();
+    getRfid_commandInfo.name = "getRfid";
+    doorLock_commandInfo.callbackClass = GetRfidResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    getRfid_parametersList.add(userId_commandParameter);
+
+    getRfid_commandInfo.parameters = getRfid_parametersList;
+    doorLock_clusterInfo.commands.add(getRfid_commandInfo);
+    List<CommandParameter> getUserType_parametersList = new ArrayList<>();
+    CommandInfo getUserType_commandInfo = new CommandInfo();
+    getUserType_commandInfo.name = "getUserType";
+    doorLock_commandInfo.callbackClass = GetUserTypeResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    getUserType_parametersList.add(userId_commandParameter);
+
+    getUserType_commandInfo.parameters = getUserType_parametersList;
+    doorLock_clusterInfo.commands.add(getUserType_commandInfo);
+    List<CommandParameter> getWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo getWeekdaySchedule_commandInfo = new CommandInfo();
+    getWeekdaySchedule_commandInfo.name = "getWeekdaySchedule";
+    doorLock_commandInfo.callbackClass = GetWeekdayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    getWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    getWeekdaySchedule_parametersList.add(userId_commandParameter);
+
+    getWeekdaySchedule_commandInfo.parameters = getWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(getWeekdaySchedule_commandInfo);
+    List<CommandParameter> getYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo getYeardaySchedule_commandInfo = new CommandInfo();
+    getYeardaySchedule_commandInfo.name = "getYeardaySchedule";
+    doorLock_commandInfo.callbackClass = GetYeardayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    getYeardaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    getYeardaySchedule_parametersList.add(userId_commandParameter);
+
+    getYeardaySchedule_commandInfo.parameters = getYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(getYeardaySchedule_commandInfo);
+    List<CommandParameter> lockDoor_parametersList = new ArrayList<>();
+    CommandInfo lockDoor_commandInfo = new CommandInfo();
+    lockDoor_commandInfo.name = "lockDoor";
+    doorLock_commandInfo.callbackClass = LockDoorResponseCallback.class;
+    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
+    lockDoor_parametersList.add(pin_commandParameter);
+
+    lockDoor_commandInfo.parameters = lockDoor_parametersList;
+    doorLock_clusterInfo.commands.add(lockDoor_commandInfo);
+    List<CommandParameter> setHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo setHolidaySchedule_commandInfo = new CommandInfo();
+    setHolidaySchedule_commandInfo.name = "setHolidaySchedule";
+    doorLock_commandInfo.callbackClass = SetHolidayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    setHolidaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    setHolidaySchedule_parametersList.add(localStartTime_commandParameter);
+
+    CommandParameter localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    setHolidaySchedule_parametersList.add(localEndTime_commandParameter);
+
+    CommandParameter operatingModeDuringHoliday_commandParameter =
+        new CommandParameter("operatingModeDuringHoliday", int.class);
+    setHolidaySchedule_parametersList.add(operatingModeDuringHoliday_commandParameter);
+
+    setHolidaySchedule_commandInfo.parameters = setHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(setHolidaySchedule_commandInfo);
+    List<CommandParameter> setPin_parametersList = new ArrayList<>();
+    CommandInfo setPin_commandInfo = new CommandInfo();
+    setPin_commandInfo.name = "setPin";
+    doorLock_commandInfo.callbackClass = SetPinResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    setPin_parametersList.add(userId_commandParameter);
+
+    CommandParameter userStatus_commandParameter = new CommandParameter("userStatus", int.class);
+    setPin_parametersList.add(userStatus_commandParameter);
+
+    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
+    setPin_parametersList.add(userType_commandParameter);
+
+    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
+    setPin_parametersList.add(pin_commandParameter);
+
+    setPin_commandInfo.parameters = setPin_parametersList;
+    doorLock_clusterInfo.commands.add(setPin_commandInfo);
+    List<CommandParameter> setRfid_parametersList = new ArrayList<>();
+    CommandInfo setRfid_commandInfo = new CommandInfo();
+    setRfid_commandInfo.name = "setRfid";
+    doorLock_commandInfo.callbackClass = SetRfidResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    setRfid_parametersList.add(userId_commandParameter);
+
+    CommandParameter userStatus_commandParameter = new CommandParameter("userStatus", int.class);
+    setRfid_parametersList.add(userStatus_commandParameter);
+
+    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
+    setRfid_parametersList.add(userType_commandParameter);
+
+    CommandParameter id_commandParameter = new CommandParameter("id", byte[].class);
+    setRfid_parametersList.add(id_commandParameter);
+
+    setRfid_commandInfo.parameters = setRfid_parametersList;
+    doorLock_clusterInfo.commands.add(setRfid_commandInfo);
+    List<CommandParameter> setUserType_parametersList = new ArrayList<>();
+    CommandInfo setUserType_commandInfo = new CommandInfo();
+    setUserType_commandInfo.name = "setUserType";
+    doorLock_commandInfo.callbackClass = SetUserTypeResponseCallback.class;
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    setUserType_parametersList.add(userId_commandParameter);
+
+    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
+    setUserType_parametersList.add(userType_commandParameter);
+
+    setUserType_commandInfo.parameters = setUserType_parametersList;
+    doorLock_clusterInfo.commands.add(setUserType_commandInfo);
+    List<CommandParameter> setWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo setWeekdaySchedule_commandInfo = new CommandInfo();
+    setWeekdaySchedule_commandInfo.name = "setWeekdaySchedule";
+    doorLock_commandInfo.callbackClass = SetWeekdayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    setWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    setWeekdaySchedule_parametersList.add(userId_commandParameter);
+
+    CommandParameter daysMask_commandParameter = new CommandParameter("daysMask", int.class);
+    setWeekdaySchedule_parametersList.add(daysMask_commandParameter);
+
+    CommandParameter startHour_commandParameter = new CommandParameter("startHour", int.class);
+    setWeekdaySchedule_parametersList.add(startHour_commandParameter);
+
+    CommandParameter startMinute_commandParameter = new CommandParameter("startMinute", int.class);
+    setWeekdaySchedule_parametersList.add(startMinute_commandParameter);
+
+    CommandParameter endHour_commandParameter = new CommandParameter("endHour", int.class);
+    setWeekdaySchedule_parametersList.add(endHour_commandParameter);
+
+    CommandParameter endMinute_commandParameter = new CommandParameter("endMinute", int.class);
+    setWeekdaySchedule_parametersList.add(endMinute_commandParameter);
+
+    setWeekdaySchedule_commandInfo.parameters = setWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(setWeekdaySchedule_commandInfo);
+    List<CommandParameter> setYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo setYeardaySchedule_commandInfo = new CommandInfo();
+    setYeardaySchedule_commandInfo.name = "setYeardaySchedule";
+    doorLock_commandInfo.callbackClass = SetYeardayScheduleResponseCallback.class;
+    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+    setYeardaySchedule_parametersList.add(scheduleId_commandParameter);
+
+    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
+    setYeardaySchedule_parametersList.add(userId_commandParameter);
+
+    CommandParameter localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    setYeardaySchedule_parametersList.add(localStartTime_commandParameter);
+
+    CommandParameter localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    setYeardaySchedule_parametersList.add(localEndTime_commandParameter);
+
+    setYeardaySchedule_commandInfo.parameters = setYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(setYeardaySchedule_commandInfo);
+    List<CommandParameter> unlockDoor_parametersList = new ArrayList<>();
+    CommandInfo unlockDoor_commandInfo = new CommandInfo();
+    unlockDoor_commandInfo.name = "unlockDoor";
+    doorLock_commandInfo.callbackClass = UnlockDoorResponseCallback.class;
+    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
+    unlockDoor_parametersList.add(pin_commandParameter);
+
+    unlockDoor_commandInfo.parameters = unlockDoor_parametersList;
+    doorLock_clusterInfo.commands.add(unlockDoor_commandInfo);
+    List<CommandParameter> unlockWithTimeout_parametersList = new ArrayList<>();
+    CommandInfo unlockWithTimeout_commandInfo = new CommandInfo();
+    unlockWithTimeout_commandInfo.name = "unlockWithTimeout";
+    doorLock_commandInfo.callbackClass = UnlockWithTimeoutResponseCallback.class;
+    CommandParameter timeoutInSeconds_commandParameter =
+        new CommandParameter("timeoutInSeconds", int.class);
+    unlockWithTimeout_parametersList.add(timeoutInSeconds_commandParameter);
+
+    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
+    unlockWithTimeout_parametersList.add(pin_commandParameter);
+
+    unlockWithTimeout_commandInfo.parameters = unlockWithTimeout_parametersList;
+    doorLock_clusterInfo.commands.add(unlockWithTimeout_commandInfo);
+    clusterInfoMapping.put("doorLock", doorLock_clusterInfo);
+    ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo("electricalMeasurement");
+    clusterInfoMapping.put("electricalMeasurement", electricalMeasurement_clusterInfo);
+    ClusterInfo ethernetNetworkDiagnostics_clusterInfo =
+        new ClusterInfo("ethernetNetworkDiagnostics");
+    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
+    CommandInfo resetCounts_commandInfo = new CommandInfo();
+    resetCounts_commandInfo.name = "resetCounts";
+    ethernetNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
+    resetCounts_commandInfo.parameters = resetCounts_parametersList;
+    ethernetNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
+    clusterInfoMapping.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
+    ClusterInfo fixedLabel_clusterInfo = new ClusterInfo("fixedLabel");
+    clusterInfoMapping.put("fixedLabel", fixedLabel_clusterInfo);
+    ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo("flowMeasurement");
+    clusterInfoMapping.put("flowMeasurement", flowMeasurement_clusterInfo);
+    ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo("generalCommissioning");
+    List<CommandParameter> armFailSafe_parametersList = new ArrayList<>();
+    CommandInfo armFailSafe_commandInfo = new CommandInfo();
+    armFailSafe_commandInfo.name = "armFailSafe";
+    generalCommissioning_commandInfo.callbackClass = ArmFailSafeResponseCallback.class;
+    CommandParameter expiryLengthSeconds_commandParameter =
+        new CommandParameter("expiryLengthSeconds", int.class);
+    armFailSafe_parametersList.add(expiryLengthSeconds_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    armFailSafe_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    armFailSafe_parametersList.add(timeoutMs_commandParameter);
+
+    armFailSafe_commandInfo.parameters = armFailSafe_parametersList;
+    generalCommissioning_clusterInfo.commands.add(armFailSafe_commandInfo);
+    List<CommandParameter> commissioningComplete_parametersList = new ArrayList<>();
+    CommandInfo commissioningComplete_commandInfo = new CommandInfo();
+    commissioningComplete_commandInfo.name = "commissioningComplete";
+    generalCommissioning_commandInfo.callbackClass = CommissioningCompleteResponseCallback.class;
+    commissioningComplete_commandInfo.parameters = commissioningComplete_parametersList;
+    generalCommissioning_clusterInfo.commands.add(commissioningComplete_commandInfo);
+    List<CommandParameter> setRegulatoryConfig_parametersList = new ArrayList<>();
+    CommandInfo setRegulatoryConfig_commandInfo = new CommandInfo();
+    setRegulatoryConfig_commandInfo.name = "setRegulatoryConfig";
+    generalCommissioning_commandInfo.callbackClass = SetRegulatoryConfigResponseCallback.class;
+    CommandParameter location_commandParameter = new CommandParameter("location", int.class);
+    setRegulatoryConfig_parametersList.add(location_commandParameter);
+
+    CommandParameter countryCode_commandParameter =
+        new CommandParameter("countryCode", String.class);
+    setRegulatoryConfig_parametersList.add(countryCode_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    setRegulatoryConfig_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    setRegulatoryConfig_parametersList.add(timeoutMs_commandParameter);
+
+    setRegulatoryConfig_commandInfo.parameters = setRegulatoryConfig_parametersList;
+    generalCommissioning_clusterInfo.commands.add(setRegulatoryConfig_commandInfo);
+    clusterInfoMapping.put("generalCommissioning", generalCommissioning_clusterInfo);
+    ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo("generalDiagnostics");
+    clusterInfoMapping.put("generalDiagnostics", generalDiagnostics_clusterInfo);
+    ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo("groupKeyManagement");
+    clusterInfoMapping.put("groupKeyManagement", groupKeyManagement_clusterInfo);
+    ClusterInfo groups_clusterInfo = new ClusterInfo("groups");
+    List<CommandParameter> addGroup_parametersList = new ArrayList<>();
+    CommandInfo addGroup_commandInfo = new CommandInfo();
+    addGroup_commandInfo.name = "addGroup";
+    groups_commandInfo.callbackClass = AddGroupResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    addGroup_parametersList.add(groupId_commandParameter);
+
+    CommandParameter groupName_commandParameter = new CommandParameter("groupName", String.class);
+    addGroup_parametersList.add(groupName_commandParameter);
+
+    addGroup_commandInfo.parameters = addGroup_parametersList;
+    groups_clusterInfo.commands.add(addGroup_commandInfo);
+    List<CommandParameter> addGroupIfIdentifying_parametersList = new ArrayList<>();
+    CommandInfo addGroupIfIdentifying_commandInfo = new CommandInfo();
+    addGroupIfIdentifying_commandInfo.name = "addGroupIfIdentifying";
+    groups_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    addGroupIfIdentifying_parametersList.add(groupId_commandParameter);
+
+    CommandParameter groupName_commandParameter = new CommandParameter("groupName", String.class);
+    addGroupIfIdentifying_parametersList.add(groupName_commandParameter);
+
+    addGroupIfIdentifying_commandInfo.parameters = addGroupIfIdentifying_parametersList;
+    groups_clusterInfo.commands.add(addGroupIfIdentifying_commandInfo);
+    List<CommandParameter> getGroupMembership_parametersList = new ArrayList<>();
+    CommandInfo getGroupMembership_commandInfo = new CommandInfo();
+    getGroupMembership_commandInfo.name = "getGroupMembership";
+    groups_commandInfo.callbackClass = GetGroupMembershipResponseCallback.class;
+    CommandParameter groupCount_commandParameter = new CommandParameter("groupCount", int.class);
+    getGroupMembership_parametersList.add(groupCount_commandParameter);
+
+    CommandParameter groupList_commandParameter = new CommandParameter("groupList", int.class);
+    getGroupMembership_parametersList.add(groupList_commandParameter);
+
+    getGroupMembership_commandInfo.parameters = getGroupMembership_parametersList;
+    groups_clusterInfo.commands.add(getGroupMembership_commandInfo);
+    List<CommandParameter> removeAllGroups_parametersList = new ArrayList<>();
+    CommandInfo removeAllGroups_commandInfo = new CommandInfo();
+    removeAllGroups_commandInfo.name = "removeAllGroups";
+    groups_commandInfo.callbackClass = DefaultClusterCallback.class;
+    removeAllGroups_commandInfo.parameters = removeAllGroups_parametersList;
+    groups_clusterInfo.commands.add(removeAllGroups_commandInfo);
+    List<CommandParameter> removeGroup_parametersList = new ArrayList<>();
+    CommandInfo removeGroup_commandInfo = new CommandInfo();
+    removeGroup_commandInfo.name = "removeGroup";
+    groups_commandInfo.callbackClass = RemoveGroupResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    removeGroup_parametersList.add(groupId_commandParameter);
+
+    removeGroup_commandInfo.parameters = removeGroup_parametersList;
+    groups_clusterInfo.commands.add(removeGroup_commandInfo);
+    List<CommandParameter> viewGroup_parametersList = new ArrayList<>();
+    CommandInfo viewGroup_commandInfo = new CommandInfo();
+    viewGroup_commandInfo.name = "viewGroup";
+    groups_commandInfo.callbackClass = ViewGroupResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    viewGroup_parametersList.add(groupId_commandParameter);
+
+    viewGroup_commandInfo.parameters = viewGroup_parametersList;
+    groups_clusterInfo.commands.add(viewGroup_commandInfo);
+    clusterInfoMapping.put("groups", groups_clusterInfo);
+    ClusterInfo identify_clusterInfo = new ClusterInfo("identify");
+    List<CommandParameter> identify_parametersList = new ArrayList<>();
+    CommandInfo identify_commandInfo = new CommandInfo();
+    identify_commandInfo.name = "identify";
+    identify_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter identifyTime_commandParameter =
+        new CommandParameter("identifyTime", int.class);
+    identify_parametersList.add(identifyTime_commandParameter);
+
+    identify_commandInfo.parameters = identify_parametersList;
+    identify_clusterInfo.commands.add(identify_commandInfo);
+    List<CommandParameter> identifyQuery_parametersList = new ArrayList<>();
+    CommandInfo identifyQuery_commandInfo = new CommandInfo();
+    identifyQuery_commandInfo.name = "identifyQuery";
+    identify_commandInfo.callbackClass = IdentifyQueryResponseCallback.class;
+    identifyQuery_commandInfo.parameters = identifyQuery_parametersList;
+    identify_clusterInfo.commands.add(identifyQuery_commandInfo);
+    List<CommandParameter> triggerEffect_parametersList = new ArrayList<>();
+    CommandInfo triggerEffect_commandInfo = new CommandInfo();
+    triggerEffect_commandInfo.name = "triggerEffect";
+    identify_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter effectIdentifier_commandParameter =
+        new CommandParameter("effectIdentifier", int.class);
+    triggerEffect_parametersList.add(effectIdentifier_commandParameter);
+
+    CommandParameter effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    triggerEffect_parametersList.add(effectVariant_commandParameter);
+
+    triggerEffect_commandInfo.parameters = triggerEffect_parametersList;
+    identify_clusterInfo.commands.add(triggerEffect_commandInfo);
+    clusterInfoMapping.put("identify", identify_clusterInfo);
+    ClusterInfo keypadInput_clusterInfo = new ClusterInfo("keypadInput");
+    List<CommandParameter> sendKey_parametersList = new ArrayList<>();
+    CommandInfo sendKey_commandInfo = new CommandInfo();
+    sendKey_commandInfo.name = "sendKey";
+    keypadInput_commandInfo.callbackClass = SendKeyResponseCallback.class;
+    CommandParameter keyCode_commandParameter = new CommandParameter("keyCode", int.class);
+    sendKey_parametersList.add(keyCode_commandParameter);
+
+    sendKey_commandInfo.parameters = sendKey_parametersList;
+    keypadInput_clusterInfo.commands.add(sendKey_commandInfo);
+    clusterInfoMapping.put("keypadInput", keypadInput_clusterInfo);
+    ClusterInfo levelControl_clusterInfo = new ClusterInfo("levelControl");
+    List<CommandParameter> move_parametersList = new ArrayList<>();
+    CommandInfo move_commandInfo = new CommandInfo();
+    move_commandInfo.name = "move";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    move_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    move_parametersList.add(rate_commandParameter);
+
+    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+    move_parametersList.add(optionMask_commandParameter);
+
+    CommandParameter optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    move_parametersList.add(optionOverride_commandParameter);
+
+    move_commandInfo.parameters = move_parametersList;
+    levelControl_clusterInfo.commands.add(move_commandInfo);
+    List<CommandParameter> moveToLevel_parametersList = new ArrayList<>();
+    CommandInfo moveToLevel_commandInfo = new CommandInfo();
+    moveToLevel_commandInfo.name = "moveToLevel";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter level_commandParameter = new CommandParameter("level", int.class);
+    moveToLevel_parametersList.add(level_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToLevel_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+    moveToLevel_parametersList.add(optionMask_commandParameter);
+
+    CommandParameter optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    moveToLevel_parametersList.add(optionOverride_commandParameter);
+
+    moveToLevel_commandInfo.parameters = moveToLevel_parametersList;
+    levelControl_clusterInfo.commands.add(moveToLevel_commandInfo);
+    List<CommandParameter> moveToLevelWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo moveToLevelWithOnOff_commandInfo = new CommandInfo();
+    moveToLevelWithOnOff_commandInfo.name = "moveToLevelWithOnOff";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter level_commandParameter = new CommandParameter("level", int.class);
+    moveToLevelWithOnOff_parametersList.add(level_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    moveToLevelWithOnOff_parametersList.add(transitionTime_commandParameter);
+
+    moveToLevelWithOnOff_commandInfo.parameters = moveToLevelWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(moveToLevelWithOnOff_commandInfo);
+    List<CommandParameter> moveWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo moveWithOnOff_commandInfo = new CommandInfo();
+    moveWithOnOff_commandInfo.name = "moveWithOnOff";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    moveWithOnOff_parametersList.add(moveMode_commandParameter);
+
+    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
+    moveWithOnOff_parametersList.add(rate_commandParameter);
+
+    moveWithOnOff_commandInfo.parameters = moveWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(moveWithOnOff_commandInfo);
+    List<CommandParameter> step_parametersList = new ArrayList<>();
+    CommandInfo step_commandInfo = new CommandInfo();
+    step_commandInfo.name = "step";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    step_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    step_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    step_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+    step_parametersList.add(optionMask_commandParameter);
+
+    CommandParameter optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    step_parametersList.add(optionOverride_commandParameter);
+
+    step_commandInfo.parameters = step_parametersList;
+    levelControl_clusterInfo.commands.add(step_commandInfo);
+    List<CommandParameter> stepWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo stepWithOnOff_commandInfo = new CommandInfo();
+    stepWithOnOff_commandInfo.name = "stepWithOnOff";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    stepWithOnOff_parametersList.add(stepMode_commandParameter);
+
+    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    stepWithOnOff_parametersList.add(stepSize_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    stepWithOnOff_parametersList.add(transitionTime_commandParameter);
+
+    stepWithOnOff_commandInfo.parameters = stepWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(stepWithOnOff_commandInfo);
+    List<CommandParameter> stop_parametersList = new ArrayList<>();
+    CommandInfo stop_commandInfo = new CommandInfo();
+    stop_commandInfo.name = "stop";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+    stop_parametersList.add(optionMask_commandParameter);
+
+    CommandParameter optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    stop_parametersList.add(optionOverride_commandParameter);
+
+    stop_commandInfo.parameters = stop_parametersList;
+    levelControl_clusterInfo.commands.add(stop_commandInfo);
+    List<CommandParameter> stopWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo stopWithOnOff_commandInfo = new CommandInfo();
+    stopWithOnOff_commandInfo.name = "stopWithOnOff";
+    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
+    stopWithOnOff_commandInfo.parameters = stopWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(stopWithOnOff_commandInfo);
+    clusterInfoMapping.put("levelControl", levelControl_clusterInfo);
+    ClusterInfo lowPower_clusterInfo = new ClusterInfo("lowPower");
+    List<CommandParameter> sleep_parametersList = new ArrayList<>();
+    CommandInfo sleep_commandInfo = new CommandInfo();
+    sleep_commandInfo.name = "sleep";
+    lowPower_commandInfo.callbackClass = DefaultClusterCallback.class;
+    sleep_commandInfo.parameters = sleep_parametersList;
+    lowPower_clusterInfo.commands.add(sleep_commandInfo);
+    clusterInfoMapping.put("lowPower", lowPower_clusterInfo);
+    ClusterInfo mediaInput_clusterInfo = new ClusterInfo("mediaInput");
+    List<CommandParameter> hideInputStatus_parametersList = new ArrayList<>();
+    CommandInfo hideInputStatus_commandInfo = new CommandInfo();
+    hideInputStatus_commandInfo.name = "hideInputStatus";
+    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    hideInputStatus_commandInfo.parameters = hideInputStatus_parametersList;
+    mediaInput_clusterInfo.commands.add(hideInputStatus_commandInfo);
+    List<CommandParameter> renameInput_parametersList = new ArrayList<>();
+    CommandInfo renameInput_commandInfo = new CommandInfo();
+    renameInput_commandInfo.name = "renameInput";
+    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
+    renameInput_parametersList.add(index_commandParameter);
+
+    CommandParameter name_commandParameter = new CommandParameter("name", String.class);
+    renameInput_parametersList.add(name_commandParameter);
+
+    renameInput_commandInfo.parameters = renameInput_parametersList;
+    mediaInput_clusterInfo.commands.add(renameInput_commandInfo);
+    List<CommandParameter> selectInput_parametersList = new ArrayList<>();
+    CommandInfo selectInput_commandInfo = new CommandInfo();
+    selectInput_commandInfo.name = "selectInput";
+    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
+    selectInput_parametersList.add(index_commandParameter);
+
+    selectInput_commandInfo.parameters = selectInput_parametersList;
+    mediaInput_clusterInfo.commands.add(selectInput_commandInfo);
+    List<CommandParameter> showInputStatus_parametersList = new ArrayList<>();
+    CommandInfo showInputStatus_commandInfo = new CommandInfo();
+    showInputStatus_commandInfo.name = "showInputStatus";
+    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
+    showInputStatus_commandInfo.parameters = showInputStatus_parametersList;
+    mediaInput_clusterInfo.commands.add(showInputStatus_commandInfo);
+    clusterInfoMapping.put("mediaInput", mediaInput_clusterInfo);
+    ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo("mediaPlayback");
+    List<CommandParameter> mediaFastForward_parametersList = new ArrayList<>();
+    CommandInfo mediaFastForward_commandInfo = new CommandInfo();
+    mediaFastForward_commandInfo.name = "mediaFastForward";
+    mediaPlayback_commandInfo.callbackClass = MediaFastForwardResponseCallback.class;
+    mediaFastForward_commandInfo.parameters = mediaFastForward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaFastForward_commandInfo);
+    List<CommandParameter> mediaNext_parametersList = new ArrayList<>();
+    CommandInfo mediaNext_commandInfo = new CommandInfo();
+    mediaNext_commandInfo.name = "mediaNext";
+    mediaPlayback_commandInfo.callbackClass = MediaNextResponseCallback.class;
+    mediaNext_commandInfo.parameters = mediaNext_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaNext_commandInfo);
+    List<CommandParameter> mediaPause_parametersList = new ArrayList<>();
+    CommandInfo mediaPause_commandInfo = new CommandInfo();
+    mediaPause_commandInfo.name = "mediaPause";
+    mediaPlayback_commandInfo.callbackClass = MediaPauseResponseCallback.class;
+    mediaPause_commandInfo.parameters = mediaPause_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPause_commandInfo);
+    List<CommandParameter> mediaPlay_parametersList = new ArrayList<>();
+    CommandInfo mediaPlay_commandInfo = new CommandInfo();
+    mediaPlay_commandInfo.name = "mediaPlay";
+    mediaPlayback_commandInfo.callbackClass = MediaPlayResponseCallback.class;
+    mediaPlay_commandInfo.parameters = mediaPlay_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlay_commandInfo);
+    List<CommandParameter> mediaPrevious_parametersList = new ArrayList<>();
+    CommandInfo mediaPrevious_commandInfo = new CommandInfo();
+    mediaPrevious_commandInfo.name = "mediaPrevious";
+    mediaPlayback_commandInfo.callbackClass = MediaPreviousResponseCallback.class;
+    mediaPrevious_commandInfo.parameters = mediaPrevious_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPrevious_commandInfo);
+    List<CommandParameter> mediaRewind_parametersList = new ArrayList<>();
+    CommandInfo mediaRewind_commandInfo = new CommandInfo();
+    mediaRewind_commandInfo.name = "mediaRewind";
+    mediaPlayback_commandInfo.callbackClass = MediaRewindResponseCallback.class;
+    mediaRewind_commandInfo.parameters = mediaRewind_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaRewind_commandInfo);
+    List<CommandParameter> mediaSeek_parametersList = new ArrayList<>();
+    CommandInfo mediaSeek_commandInfo = new CommandInfo();
+    mediaSeek_commandInfo.name = "mediaSeek";
+    mediaPlayback_commandInfo.callbackClass = MediaSeekResponseCallback.class;
+    CommandParameter position_commandParameter = new CommandParameter("position", long.class);
+    mediaSeek_parametersList.add(position_commandParameter);
+
+    mediaSeek_commandInfo.parameters = mediaSeek_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaSeek_commandInfo);
+    List<CommandParameter> mediaSkipBackward_parametersList = new ArrayList<>();
+    CommandInfo mediaSkipBackward_commandInfo = new CommandInfo();
+    mediaSkipBackward_commandInfo.name = "mediaSkipBackward";
+    mediaPlayback_commandInfo.callbackClass = MediaSkipBackwardResponseCallback.class;
+    CommandParameter deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaSkipBackward_parametersList.add(deltaPositionMilliseconds_commandParameter);
+
+    mediaSkipBackward_commandInfo.parameters = mediaSkipBackward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaSkipBackward_commandInfo);
+    List<CommandParameter> mediaSkipForward_parametersList = new ArrayList<>();
+    CommandInfo mediaSkipForward_commandInfo = new CommandInfo();
+    mediaSkipForward_commandInfo.name = "mediaSkipForward";
+    mediaPlayback_commandInfo.callbackClass = MediaSkipForwardResponseCallback.class;
+    CommandParameter deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaSkipForward_parametersList.add(deltaPositionMilliseconds_commandParameter);
+
+    mediaSkipForward_commandInfo.parameters = mediaSkipForward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaSkipForward_commandInfo);
+    List<CommandParameter> mediaStartOver_parametersList = new ArrayList<>();
+    CommandInfo mediaStartOver_commandInfo = new CommandInfo();
+    mediaStartOver_commandInfo.name = "mediaStartOver";
+    mediaPlayback_commandInfo.callbackClass = MediaStartOverResponseCallback.class;
+    mediaStartOver_commandInfo.parameters = mediaStartOver_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaStartOver_commandInfo);
+    List<CommandParameter> mediaStop_parametersList = new ArrayList<>();
+    CommandInfo mediaStop_commandInfo = new CommandInfo();
+    mediaStop_commandInfo.name = "mediaStop";
+    mediaPlayback_commandInfo.callbackClass = MediaStopResponseCallback.class;
+    mediaStop_commandInfo.parameters = mediaStop_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaStop_commandInfo);
+    clusterInfoMapping.put("mediaPlayback", mediaPlayback_clusterInfo);
+    ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo("networkCommissioning");
+    List<CommandParameter> addThreadNetwork_parametersList = new ArrayList<>();
+    CommandInfo addThreadNetwork_commandInfo = new CommandInfo();
+    addThreadNetwork_commandInfo.name = "addThreadNetwork";
+    networkCommissioning_commandInfo.callbackClass = AddThreadNetworkResponseCallback.class;
+    CommandParameter operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    addThreadNetwork_parametersList.add(operationalDataset_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    addThreadNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    addThreadNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    addThreadNetwork_commandInfo.parameters = addThreadNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(addThreadNetwork_commandInfo);
+    List<CommandParameter> addWiFiNetwork_parametersList = new ArrayList<>();
+    CommandInfo addWiFiNetwork_commandInfo = new CommandInfo();
+    addWiFiNetwork_commandInfo.name = "addWiFiNetwork";
+    networkCommissioning_commandInfo.callbackClass = AddWiFiNetworkResponseCallback.class;
+    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+    addWiFiNetwork_parametersList.add(ssid_commandParameter);
+
+    CommandParameter credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    addWiFiNetwork_parametersList.add(credentials_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    addWiFiNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    addWiFiNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    addWiFiNetwork_commandInfo.parameters = addWiFiNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(addWiFiNetwork_commandInfo);
+    List<CommandParameter> disableNetwork_parametersList = new ArrayList<>();
+    CommandInfo disableNetwork_commandInfo = new CommandInfo();
+    disableNetwork_commandInfo.name = "disableNetwork";
+    networkCommissioning_commandInfo.callbackClass = DisableNetworkResponseCallback.class;
+    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+    disableNetwork_parametersList.add(networkID_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    disableNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    disableNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    disableNetwork_commandInfo.parameters = disableNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(disableNetwork_commandInfo);
+    List<CommandParameter> enableNetwork_parametersList = new ArrayList<>();
+    CommandInfo enableNetwork_commandInfo = new CommandInfo();
+    enableNetwork_commandInfo.name = "enableNetwork";
+    networkCommissioning_commandInfo.callbackClass = EnableNetworkResponseCallback.class;
+    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+    enableNetwork_parametersList.add(networkID_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    enableNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    enableNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    enableNetwork_commandInfo.parameters = enableNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(enableNetwork_commandInfo);
+    List<CommandParameter> getLastNetworkCommissioningResult_parametersList = new ArrayList<>();
+    CommandInfo getLastNetworkCommissioningResult_commandInfo = new CommandInfo();
+    getLastNetworkCommissioningResult_commandInfo.name = "getLastNetworkCommissioningResult";
+    networkCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    getLastNetworkCommissioningResult_parametersList.add(timeoutMs_commandParameter);
+
+    getLastNetworkCommissioningResult_commandInfo.parameters =
+        getLastNetworkCommissioningResult_parametersList;
+    networkCommissioning_clusterInfo.commands.add(getLastNetworkCommissioningResult_commandInfo);
+    List<CommandParameter> removeNetwork_parametersList = new ArrayList<>();
+    CommandInfo removeNetwork_commandInfo = new CommandInfo();
+    removeNetwork_commandInfo.name = "removeNetwork";
+    networkCommissioning_commandInfo.callbackClass = RemoveNetworkResponseCallback.class;
+    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+    removeNetwork_parametersList.add(networkID_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    removeNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    removeNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    removeNetwork_commandInfo.parameters = removeNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(removeNetwork_commandInfo);
+    List<CommandParameter> scanNetworks_parametersList = new ArrayList<>();
+    CommandInfo scanNetworks_commandInfo = new CommandInfo();
+    scanNetworks_commandInfo.name = "scanNetworks";
+    networkCommissioning_commandInfo.callbackClass = ScanNetworksResponseCallback.class;
+    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+    scanNetworks_parametersList.add(ssid_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    scanNetworks_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    scanNetworks_parametersList.add(timeoutMs_commandParameter);
+
+    scanNetworks_commandInfo.parameters = scanNetworks_parametersList;
+    networkCommissioning_clusterInfo.commands.add(scanNetworks_commandInfo);
+    List<CommandParameter> updateThreadNetwork_parametersList = new ArrayList<>();
+    CommandInfo updateThreadNetwork_commandInfo = new CommandInfo();
+    updateThreadNetwork_commandInfo.name = "updateThreadNetwork";
+    networkCommissioning_commandInfo.callbackClass = UpdateThreadNetworkResponseCallback.class;
+    CommandParameter operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    updateThreadNetwork_parametersList.add(operationalDataset_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    updateThreadNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    updateThreadNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    updateThreadNetwork_commandInfo.parameters = updateThreadNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(updateThreadNetwork_commandInfo);
+    List<CommandParameter> updateWiFiNetwork_parametersList = new ArrayList<>();
+    CommandInfo updateWiFiNetwork_commandInfo = new CommandInfo();
+    updateWiFiNetwork_commandInfo.name = "updateWiFiNetwork";
+    networkCommissioning_commandInfo.callbackClass = UpdateWiFiNetworkResponseCallback.class;
+    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+    updateWiFiNetwork_parametersList.add(ssid_commandParameter);
+
+    CommandParameter credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    updateWiFiNetwork_parametersList.add(credentials_commandParameter);
+
+    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+    updateWiFiNetwork_parametersList.add(breadcrumb_commandParameter);
+
+    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+    updateWiFiNetwork_parametersList.add(timeoutMs_commandParameter);
+
+    updateWiFiNetwork_commandInfo.parameters = updateWiFiNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(updateWiFiNetwork_commandInfo);
+    clusterInfoMapping.put("networkCommissioning", networkCommissioning_clusterInfo);
+    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
+        new ClusterInfo("otaSoftwareUpdateProvider");
+    List<CommandParameter> applyUpdateRequest_parametersList = new ArrayList<>();
+    CommandInfo applyUpdateRequest_commandInfo = new CommandInfo();
+    applyUpdateRequest_commandInfo.name = "applyUpdateRequest";
+    otaSoftwareUpdateProvider_commandInfo.callbackClass = ApplyUpdateRequestResponseCallback.class;
+    CommandParameter updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    applyUpdateRequest_parametersList.add(updateToken_commandParameter);
+
+    CommandParameter newVersion_commandParameter = new CommandParameter("newVersion", long.class);
+    applyUpdateRequest_parametersList.add(newVersion_commandParameter);
+
+    applyUpdateRequest_commandInfo.parameters = applyUpdateRequest_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(applyUpdateRequest_commandInfo);
+    List<CommandParameter> notifyUpdateApplied_parametersList = new ArrayList<>();
+    CommandInfo notifyUpdateApplied_commandInfo = new CommandInfo();
+    notifyUpdateApplied_commandInfo.name = "notifyUpdateApplied";
+    otaSoftwareUpdateProvider_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    notifyUpdateApplied_parametersList.add(updateToken_commandParameter);
+
+    CommandParameter softwareVersion_commandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    notifyUpdateApplied_parametersList.add(softwareVersion_commandParameter);
+
+    notifyUpdateApplied_commandInfo.parameters = notifyUpdateApplied_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(notifyUpdateApplied_commandInfo);
+    List<CommandParameter> queryImage_parametersList = new ArrayList<>();
+    CommandInfo queryImage_commandInfo = new CommandInfo();
+    queryImage_commandInfo.name = "queryImage";
+    otaSoftwareUpdateProvider_commandInfo.callbackClass = QueryImageResponseCallback.class;
+    CommandParameter vendorId_commandParameter = new CommandParameter("vendorId", int.class);
+    queryImage_parametersList.add(vendorId_commandParameter);
+
+    CommandParameter productId_commandParameter = new CommandParameter("productId", int.class);
+    queryImage_parametersList.add(productId_commandParameter);
+
+    CommandParameter hardwareVersion_commandParameter =
+        new CommandParameter("hardwareVersion", int.class);
+    queryImage_parametersList.add(hardwareVersion_commandParameter);
+
+    CommandParameter softwareVersion_commandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    queryImage_parametersList.add(softwareVersion_commandParameter);
+
+    CommandParameter protocolsSupported_commandParameter =
+        new CommandParameter("protocolsSupported", int.class);
+    queryImage_parametersList.add(protocolsSupported_commandParameter);
+
+    CommandParameter location_commandParameter = new CommandParameter("location", String.class);
+    queryImage_parametersList.add(location_commandParameter);
+
+    CommandParameter requestorCanConsent_commandParameter =
+        new CommandParameter("requestorCanConsent", boolean.class);
+    queryImage_parametersList.add(requestorCanConsent_commandParameter);
+
+    CommandParameter metadataForProvider_commandParameter =
+        new CommandParameter("metadataForProvider", byte[].class);
+    queryImage_parametersList.add(metadataForProvider_commandParameter);
+
+    queryImage_commandInfo.parameters = queryImage_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(queryImage_commandInfo);
+    clusterInfoMapping.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
+    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
+        new ClusterInfo("otaSoftwareUpdateRequestor");
+    List<CommandParameter> announceOtaProvider_parametersList = new ArrayList<>();
+    CommandInfo announceOtaProvider_commandInfo = new CommandInfo();
+    announceOtaProvider_commandInfo.name = "announceOtaProvider";
+    otaSoftwareUpdateRequestor_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter providerLocation_commandParameter =
+        new CommandParameter("providerLocation", byte[].class);
+    announceOtaProvider_parametersList.add(providerLocation_commandParameter);
+
+    CommandParameter vendorId_commandParameter = new CommandParameter("vendorId", int.class);
+    announceOtaProvider_parametersList.add(vendorId_commandParameter);
+
+    CommandParameter announcementReason_commandParameter =
+        new CommandParameter("announcementReason", int.class);
+    announceOtaProvider_parametersList.add(announcementReason_commandParameter);
+
+    CommandParameter metadataForNode_commandParameter =
+        new CommandParameter("metadataForNode", byte[].class);
+    announceOtaProvider_parametersList.add(metadataForNode_commandParameter);
+
+    announceOtaProvider_commandInfo.parameters = announceOtaProvider_parametersList;
+    otaSoftwareUpdateRequestor_clusterInfo.commands.add(announceOtaProvider_commandInfo);
+    clusterInfoMapping.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
+    ClusterInfo occupancySensing_clusterInfo = new ClusterInfo("occupancySensing");
+    clusterInfoMapping.put("occupancySensing", occupancySensing_clusterInfo);
+    ClusterInfo onOff_clusterInfo = new ClusterInfo("onOff");
+    List<CommandParameter> off_parametersList = new ArrayList<>();
+    CommandInfo off_commandInfo = new CommandInfo();
+    off_commandInfo.name = "off";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    off_commandInfo.parameters = off_parametersList;
+    onOff_clusterInfo.commands.add(off_commandInfo);
+    List<CommandParameter> offWithEffect_parametersList = new ArrayList<>();
+    CommandInfo offWithEffect_commandInfo = new CommandInfo();
+    offWithEffect_commandInfo.name = "offWithEffect";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter effectId_commandParameter = new CommandParameter("effectId", int.class);
+    offWithEffect_parametersList.add(effectId_commandParameter);
+
+    CommandParameter effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    offWithEffect_parametersList.add(effectVariant_commandParameter);
+
+    offWithEffect_commandInfo.parameters = offWithEffect_parametersList;
+    onOff_clusterInfo.commands.add(offWithEffect_commandInfo);
+    List<CommandParameter> on_parametersList = new ArrayList<>();
+    CommandInfo on_commandInfo = new CommandInfo();
+    on_commandInfo.name = "on";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    on_commandInfo.parameters = on_parametersList;
+    onOff_clusterInfo.commands.add(on_commandInfo);
+    List<CommandParameter> onWithRecallGlobalScene_parametersList = new ArrayList<>();
+    CommandInfo onWithRecallGlobalScene_commandInfo = new CommandInfo();
+    onWithRecallGlobalScene_commandInfo.name = "onWithRecallGlobalScene";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    onWithRecallGlobalScene_commandInfo.parameters = onWithRecallGlobalScene_parametersList;
+    onOff_clusterInfo.commands.add(onWithRecallGlobalScene_commandInfo);
+    List<CommandParameter> onWithTimedOff_parametersList = new ArrayList<>();
+    CommandInfo onWithTimedOff_commandInfo = new CommandInfo();
+    onWithTimedOff_commandInfo.name = "onWithTimedOff";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter onOffControl_commandParameter =
+        new CommandParameter("onOffControl", int.class);
+    onWithTimedOff_parametersList.add(onOffControl_commandParameter);
+
+    CommandParameter onTime_commandParameter = new CommandParameter("onTime", int.class);
+    onWithTimedOff_parametersList.add(onTime_commandParameter);
+
+    CommandParameter offWaitTime_commandParameter = new CommandParameter("offWaitTime", int.class);
+    onWithTimedOff_parametersList.add(offWaitTime_commandParameter);
+
+    onWithTimedOff_commandInfo.parameters = onWithTimedOff_parametersList;
+    onOff_clusterInfo.commands.add(onWithTimedOff_commandInfo);
+    List<CommandParameter> toggle_parametersList = new ArrayList<>();
+    CommandInfo toggle_commandInfo = new CommandInfo();
+    toggle_commandInfo.name = "toggle";
+    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
+    toggle_commandInfo.parameters = toggle_parametersList;
+    onOff_clusterInfo.commands.add(toggle_commandInfo);
+    clusterInfoMapping.put("onOff", onOff_clusterInfo);
+    ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo("onOffSwitchConfiguration");
+    clusterInfoMapping.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
+    ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo("operationalCredentials");
+    List<CommandParameter> addNOC_parametersList = new ArrayList<>();
+    CommandInfo addNOC_commandInfo = new CommandInfo();
+    addNOC_commandInfo.name = "addNOC";
+    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
+    CommandParameter NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
+    addNOC_parametersList.add(NOCValue_commandParameter);
+
+    CommandParameter ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
+    addNOC_parametersList.add(ICACValue_commandParameter);
+
+    CommandParameter IPKValue_commandParameter = new CommandParameter("IPKValue", byte[].class);
+    addNOC_parametersList.add(IPKValue_commandParameter);
+
+    CommandParameter caseAdminNode_commandParameter =
+        new CommandParameter("caseAdminNode", long.class);
+    addNOC_parametersList.add(caseAdminNode_commandParameter);
+
+    CommandParameter adminVendorId_commandParameter =
+        new CommandParameter("adminVendorId", int.class);
+    addNOC_parametersList.add(adminVendorId_commandParameter);
+
+    addNOC_commandInfo.parameters = addNOC_parametersList;
+    operationalCredentials_clusterInfo.commands.add(addNOC_commandInfo);
+    List<CommandParameter> addTrustedRootCertificate_parametersList = new ArrayList<>();
+    CommandInfo addTrustedRootCertificate_commandInfo = new CommandInfo();
+    addTrustedRootCertificate_commandInfo.name = "addTrustedRootCertificate";
+    operationalCredentials_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter rootCertificate_commandParameter =
+        new CommandParameter("rootCertificate", byte[].class);
+    addTrustedRootCertificate_parametersList.add(rootCertificate_commandParameter);
+
+    addTrustedRootCertificate_commandInfo.parameters = addTrustedRootCertificate_parametersList;
+    operationalCredentials_clusterInfo.commands.add(addTrustedRootCertificate_commandInfo);
+    List<CommandParameter> attestationRequest_parametersList = new ArrayList<>();
+    CommandInfo attestationRequest_commandInfo = new CommandInfo();
+    attestationRequest_commandInfo.name = "attestationRequest";
+    operationalCredentials_commandInfo.callbackClass = AttestationResponseCallback.class;
+    CommandParameter attestationNonce_commandParameter =
+        new CommandParameter("attestationNonce", byte[].class);
+    attestationRequest_parametersList.add(attestationNonce_commandParameter);
+
+    attestationRequest_commandInfo.parameters = attestationRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(attestationRequest_commandInfo);
+    List<CommandParameter> certificateChainRequest_parametersList = new ArrayList<>();
+    CommandInfo certificateChainRequest_commandInfo = new CommandInfo();
+    certificateChainRequest_commandInfo.name = "certificateChainRequest";
+    operationalCredentials_commandInfo.callbackClass = CertificateChainResponseCallback.class;
+    CommandParameter certificateType_commandParameter =
+        new CommandParameter("certificateType", int.class);
+    certificateChainRequest_parametersList.add(certificateType_commandParameter);
+
+    certificateChainRequest_commandInfo.parameters = certificateChainRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(certificateChainRequest_commandInfo);
+    List<CommandParameter> opCSRRequest_parametersList = new ArrayList<>();
+    CommandInfo opCSRRequest_commandInfo = new CommandInfo();
+    opCSRRequest_commandInfo.name = "opCSRRequest";
+    operationalCredentials_commandInfo.callbackClass = OpCSRResponseCallback.class;
+    CommandParameter CSRNonce_commandParameter = new CommandParameter("CSRNonce", byte[].class);
+    opCSRRequest_parametersList.add(CSRNonce_commandParameter);
+
+    opCSRRequest_commandInfo.parameters = opCSRRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(opCSRRequest_commandInfo);
+    List<CommandParameter> removeFabric_parametersList = new ArrayList<>();
+    CommandInfo removeFabric_commandInfo = new CommandInfo();
+    removeFabric_commandInfo.name = "removeFabric";
+    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
+    CommandParameter fabricIndex_commandParameter = new CommandParameter("fabricIndex", int.class);
+    removeFabric_parametersList.add(fabricIndex_commandParameter);
+
+    removeFabric_commandInfo.parameters = removeFabric_parametersList;
+    operationalCredentials_clusterInfo.commands.add(removeFabric_commandInfo);
+    List<CommandParameter> removeTrustedRootCertificate_parametersList = new ArrayList<>();
+    CommandInfo removeTrustedRootCertificate_commandInfo = new CommandInfo();
+    removeTrustedRootCertificate_commandInfo.name = "removeTrustedRootCertificate";
+    operationalCredentials_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter trustedRootIdentifier_commandParameter =
+        new CommandParameter("trustedRootIdentifier", byte[].class);
+    removeTrustedRootCertificate_parametersList.add(trustedRootIdentifier_commandParameter);
+
+    removeTrustedRootCertificate_commandInfo.parameters =
+        removeTrustedRootCertificate_parametersList;
+    operationalCredentials_clusterInfo.commands.add(removeTrustedRootCertificate_commandInfo);
+    List<CommandParameter> updateFabricLabel_parametersList = new ArrayList<>();
+    CommandInfo updateFabricLabel_commandInfo = new CommandInfo();
+    updateFabricLabel_commandInfo.name = "updateFabricLabel";
+    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
+    CommandParameter label_commandParameter = new CommandParameter("label", String.class);
+    updateFabricLabel_parametersList.add(label_commandParameter);
+
+    updateFabricLabel_commandInfo.parameters = updateFabricLabel_parametersList;
+    operationalCredentials_clusterInfo.commands.add(updateFabricLabel_commandInfo);
+    List<CommandParameter> updateNOC_parametersList = new ArrayList<>();
+    CommandInfo updateNOC_commandInfo = new CommandInfo();
+    updateNOC_commandInfo.name = "updateNOC";
+    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
+    CommandParameter NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
+    updateNOC_parametersList.add(NOCValue_commandParameter);
+
+    CommandParameter ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
+    updateNOC_parametersList.add(ICACValue_commandParameter);
+
+    updateNOC_commandInfo.parameters = updateNOC_parametersList;
+    operationalCredentials_clusterInfo.commands.add(updateNOC_commandInfo);
+    clusterInfoMapping.put("operationalCredentials", operationalCredentials_clusterInfo);
+    ClusterInfo powerSource_clusterInfo = new ClusterInfo("powerSource");
+    clusterInfoMapping.put("powerSource", powerSource_clusterInfo);
+    ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo("pressureMeasurement");
+    clusterInfoMapping.put("pressureMeasurement", pressureMeasurement_clusterInfo);
+    ClusterInfo pumpConfigurationAndControl_clusterInfo =
+        new ClusterInfo("pumpConfigurationAndControl");
+    clusterInfoMapping.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
+    ClusterInfo relativeHumidityMeasurement_clusterInfo =
+        new ClusterInfo("relativeHumidityMeasurement");
+    clusterInfoMapping.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
+    ClusterInfo scenes_clusterInfo = new ClusterInfo("scenes");
+    List<CommandParameter> addScene_parametersList = new ArrayList<>();
+    CommandInfo addScene_commandInfo = new CommandInfo();
+    addScene_commandInfo.name = "addScene";
+    scenes_commandInfo.callbackClass = AddSceneResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    addScene_parametersList.add(groupId_commandParameter);
+
+    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    addScene_parametersList.add(sceneId_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    addScene_parametersList.add(transitionTime_commandParameter);
+
+    CommandParameter sceneName_commandParameter = new CommandParameter("sceneName", String.class);
+    addScene_parametersList.add(sceneName_commandParameter);
+
+    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+    addScene_parametersList.add(clusterId_commandParameter);
+
+    CommandParameter length_commandParameter = new CommandParameter("length", int.class);
+    addScene_parametersList.add(length_commandParameter);
+
+    CommandParameter value_commandParameter = new CommandParameter("value", int.class);
+    addScene_parametersList.add(value_commandParameter);
+
+    addScene_commandInfo.parameters = addScene_parametersList;
+    scenes_clusterInfo.commands.add(addScene_commandInfo);
+    List<CommandParameter> getSceneMembership_parametersList = new ArrayList<>();
+    CommandInfo getSceneMembership_commandInfo = new CommandInfo();
+    getSceneMembership_commandInfo.name = "getSceneMembership";
+    scenes_commandInfo.callbackClass = GetSceneMembershipResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    getSceneMembership_parametersList.add(groupId_commandParameter);
+
+    getSceneMembership_commandInfo.parameters = getSceneMembership_parametersList;
+    scenes_clusterInfo.commands.add(getSceneMembership_commandInfo);
+    List<CommandParameter> recallScene_parametersList = new ArrayList<>();
+    CommandInfo recallScene_commandInfo = new CommandInfo();
+    recallScene_commandInfo.name = "recallScene";
+    scenes_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    recallScene_parametersList.add(groupId_commandParameter);
+
+    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    recallScene_parametersList.add(sceneId_commandParameter);
+
+    CommandParameter transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    recallScene_parametersList.add(transitionTime_commandParameter);
+
+    recallScene_commandInfo.parameters = recallScene_parametersList;
+    scenes_clusterInfo.commands.add(recallScene_commandInfo);
+    List<CommandParameter> removeAllScenes_parametersList = new ArrayList<>();
+    CommandInfo removeAllScenes_commandInfo = new CommandInfo();
+    removeAllScenes_commandInfo.name = "removeAllScenes";
+    scenes_commandInfo.callbackClass = RemoveAllScenesResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    removeAllScenes_parametersList.add(groupId_commandParameter);
+
+    removeAllScenes_commandInfo.parameters = removeAllScenes_parametersList;
+    scenes_clusterInfo.commands.add(removeAllScenes_commandInfo);
+    List<CommandParameter> removeScene_parametersList = new ArrayList<>();
+    CommandInfo removeScene_commandInfo = new CommandInfo();
+    removeScene_commandInfo.name = "removeScene";
+    scenes_commandInfo.callbackClass = RemoveSceneResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    removeScene_parametersList.add(groupId_commandParameter);
+
+    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    removeScene_parametersList.add(sceneId_commandParameter);
+
+    removeScene_commandInfo.parameters = removeScene_parametersList;
+    scenes_clusterInfo.commands.add(removeScene_commandInfo);
+    List<CommandParameter> storeScene_parametersList = new ArrayList<>();
+    CommandInfo storeScene_commandInfo = new CommandInfo();
+    storeScene_commandInfo.name = "storeScene";
+    scenes_commandInfo.callbackClass = StoreSceneResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    storeScene_parametersList.add(groupId_commandParameter);
+
+    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    storeScene_parametersList.add(sceneId_commandParameter);
+
+    storeScene_commandInfo.parameters = storeScene_parametersList;
+    scenes_clusterInfo.commands.add(storeScene_commandInfo);
+    List<CommandParameter> viewScene_parametersList = new ArrayList<>();
+    CommandInfo viewScene_commandInfo = new CommandInfo();
+    viewScene_commandInfo.name = "viewScene";
+    scenes_commandInfo.callbackClass = ViewSceneResponseCallback.class;
+    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
+    viewScene_parametersList.add(groupId_commandParameter);
+
+    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    viewScene_parametersList.add(sceneId_commandParameter);
+
+    viewScene_commandInfo.parameters = viewScene_parametersList;
+    scenes_clusterInfo.commands.add(viewScene_commandInfo);
+    clusterInfoMapping.put("scenes", scenes_clusterInfo);
+    ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo("softwareDiagnostics");
+    List<CommandParameter> resetWatermarks_parametersList = new ArrayList<>();
+    CommandInfo resetWatermarks_commandInfo = new CommandInfo();
+    resetWatermarks_commandInfo.name = "resetWatermarks";
+    softwareDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
+    resetWatermarks_commandInfo.parameters = resetWatermarks_parametersList;
+    softwareDiagnostics_clusterInfo.commands.add(resetWatermarks_commandInfo);
+    clusterInfoMapping.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
+    ClusterInfo switch_clusterInfo = new ClusterInfo("switch");
+    clusterInfoMapping.put("switch", switch_clusterInfo);
+    ClusterInfo tvChannel_clusterInfo = new ClusterInfo("tvChannel");
+    List<CommandParameter> changeChannel_parametersList = new ArrayList<>();
+    CommandInfo changeChannel_commandInfo = new CommandInfo();
+    changeChannel_commandInfo.name = "changeChannel";
+    tvChannel_commandInfo.callbackClass = ChangeChannelResponseCallback.class;
+    CommandParameter match_commandParameter = new CommandParameter("match", String.class);
+    changeChannel_parametersList.add(match_commandParameter);
+
+    changeChannel_commandInfo.parameters = changeChannel_parametersList;
+    tvChannel_clusterInfo.commands.add(changeChannel_commandInfo);
+    List<CommandParameter> changeChannelByNumber_parametersList = new ArrayList<>();
+    CommandInfo changeChannelByNumber_commandInfo = new CommandInfo();
+    changeChannelByNumber_commandInfo.name = "changeChannelByNumber";
+    tvChannel_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter majorNumber_commandParameter = new CommandParameter("majorNumber", int.class);
+    changeChannelByNumber_parametersList.add(majorNumber_commandParameter);
+
+    CommandParameter minorNumber_commandParameter = new CommandParameter("minorNumber", int.class);
+    changeChannelByNumber_parametersList.add(minorNumber_commandParameter);
+
+    changeChannelByNumber_commandInfo.parameters = changeChannelByNumber_parametersList;
+    tvChannel_clusterInfo.commands.add(changeChannelByNumber_commandInfo);
+    List<CommandParameter> skipChannel_parametersList = new ArrayList<>();
+    CommandInfo skipChannel_commandInfo = new CommandInfo();
+    skipChannel_commandInfo.name = "skipChannel";
+    tvChannel_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter count_commandParameter = new CommandParameter("count", int.class);
+    skipChannel_parametersList.add(count_commandParameter);
+
+    skipChannel_commandInfo.parameters = skipChannel_parametersList;
+    tvChannel_clusterInfo.commands.add(skipChannel_commandInfo);
+    clusterInfoMapping.put("tvChannel", tvChannel_clusterInfo);
+    ClusterInfo targetNavigator_clusterInfo = new ClusterInfo("targetNavigator");
+    List<CommandParameter> navigateTarget_parametersList = new ArrayList<>();
+    CommandInfo navigateTarget_commandInfo = new CommandInfo();
+    navigateTarget_commandInfo.name = "navigateTarget";
+    targetNavigator_commandInfo.callbackClass = NavigateTargetResponseCallback.class;
+    CommandParameter target_commandParameter = new CommandParameter("target", int.class);
+    navigateTarget_parametersList.add(target_commandParameter);
+
+    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
+    navigateTarget_parametersList.add(data_commandParameter);
+
+    navigateTarget_commandInfo.parameters = navigateTarget_parametersList;
+    targetNavigator_clusterInfo.commands.add(navigateTarget_commandInfo);
+    clusterInfoMapping.put("targetNavigator", targetNavigator_clusterInfo);
+    ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo("temperatureMeasurement");
+    clusterInfoMapping.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
+    ClusterInfo testCluster_clusterInfo = new ClusterInfo("testCluster");
+    List<CommandParameter> test_parametersList = new ArrayList<>();
+    CommandInfo test_commandInfo = new CommandInfo();
+    test_commandInfo.name = "test";
+    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
+    test_commandInfo.parameters = test_parametersList;
+    testCluster_clusterInfo.commands.add(test_commandInfo);
+    List<CommandParameter> testAddArguments_parametersList = new ArrayList<>();
+    CommandInfo testAddArguments_commandInfo = new CommandInfo();
+    testAddArguments_commandInfo.name = "testAddArguments";
+    testCluster_commandInfo.callbackClass = TestAddArgumentsResponseCallback.class;
+    CommandParameter arg1_commandParameter = new CommandParameter("arg1", int.class);
+    testAddArguments_parametersList.add(arg1_commandParameter);
+
+    CommandParameter arg2_commandParameter = new CommandParameter("arg2", int.class);
+    testAddArguments_parametersList.add(arg2_commandParameter);
+
+    testAddArguments_commandInfo.parameters = testAddArguments_parametersList;
+    testCluster_clusterInfo.commands.add(testAddArguments_commandInfo);
+    List<CommandParameter> testNotHandled_parametersList = new ArrayList<>();
+    CommandInfo testNotHandled_commandInfo = new CommandInfo();
+    testNotHandled_commandInfo.name = "testNotHandled";
+    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
+    testNotHandled_commandInfo.parameters = testNotHandled_parametersList;
+    testCluster_clusterInfo.commands.add(testNotHandled_commandInfo);
+    List<CommandParameter> testSpecific_parametersList = new ArrayList<>();
+    CommandInfo testSpecific_commandInfo = new CommandInfo();
+    testSpecific_commandInfo.name = "testSpecific";
+    testCluster_commandInfo.callbackClass = TestSpecificResponseCallback.class;
+    testSpecific_commandInfo.parameters = testSpecific_parametersList;
+    testCluster_clusterInfo.commands.add(testSpecific_commandInfo);
+    List<CommandParameter> testUnknownCommand_parametersList = new ArrayList<>();
+    CommandInfo testUnknownCommand_commandInfo = new CommandInfo();
+    testUnknownCommand_commandInfo.name = "testUnknownCommand";
+    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
+    testUnknownCommand_commandInfo.parameters = testUnknownCommand_parametersList;
+    testCluster_clusterInfo.commands.add(testUnknownCommand_commandInfo);
+    clusterInfoMapping.put("testCluster", testCluster_clusterInfo);
+    ClusterInfo thermostat_clusterInfo = new ClusterInfo("thermostat");
+    List<CommandParameter> clearWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo clearWeeklySchedule_commandInfo = new CommandInfo();
+    clearWeeklySchedule_commandInfo.name = "clearWeeklySchedule";
+    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
+    clearWeeklySchedule_commandInfo.parameters = clearWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(clearWeeklySchedule_commandInfo);
+    List<CommandParameter> getRelayStatusLog_parametersList = new ArrayList<>();
+    CommandInfo getRelayStatusLog_commandInfo = new CommandInfo();
+    getRelayStatusLog_commandInfo.name = "getRelayStatusLog";
+    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
+    getRelayStatusLog_commandInfo.parameters = getRelayStatusLog_parametersList;
+    thermostat_clusterInfo.commands.add(getRelayStatusLog_commandInfo);
+    List<CommandParameter> getWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo getWeeklySchedule_commandInfo = new CommandInfo();
+    getWeeklySchedule_commandInfo.name = "getWeeklySchedule";
+    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter daysToReturn_commandParameter =
+        new CommandParameter("daysToReturn", int.class);
+    getWeeklySchedule_parametersList.add(daysToReturn_commandParameter);
+
+    CommandParameter modeToReturn_commandParameter =
+        new CommandParameter("modeToReturn", int.class);
+    getWeeklySchedule_parametersList.add(modeToReturn_commandParameter);
+
+    getWeeklySchedule_commandInfo.parameters = getWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(getWeeklySchedule_commandInfo);
+    List<CommandParameter> setWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo setWeeklySchedule_commandInfo = new CommandInfo();
+    setWeeklySchedule_commandInfo.name = "setWeeklySchedule";
+    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter numberOfTransitionsForSequence_commandParameter =
+        new CommandParameter("numberOfTransitionsForSequence", int.class);
+    setWeeklySchedule_parametersList.add(numberOfTransitionsForSequence_commandParameter);
+
+    CommandParameter dayOfWeekForSequence_commandParameter =
+        new CommandParameter("dayOfWeekForSequence", int.class);
+    setWeeklySchedule_parametersList.add(dayOfWeekForSequence_commandParameter);
+
+    CommandParameter modeForSequence_commandParameter =
+        new CommandParameter("modeForSequence", int.class);
+    setWeeklySchedule_parametersList.add(modeForSequence_commandParameter);
+
+    CommandParameter payload_commandParameter = new CommandParameter("payload", int.class);
+    setWeeklySchedule_parametersList.add(payload_commandParameter);
+
+    setWeeklySchedule_commandInfo.parameters = setWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(setWeeklySchedule_commandInfo);
+    List<CommandParameter> setpointRaiseLower_parametersList = new ArrayList<>();
+    CommandInfo setpointRaiseLower_commandInfo = new CommandInfo();
+    setpointRaiseLower_commandInfo.name = "setpointRaiseLower";
+    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter mode_commandParameter = new CommandParameter("mode", int.class);
+    setpointRaiseLower_parametersList.add(mode_commandParameter);
+
+    CommandParameter amount_commandParameter = new CommandParameter("amount", int.class);
+    setpointRaiseLower_parametersList.add(amount_commandParameter);
+
+    setpointRaiseLower_commandInfo.parameters = setpointRaiseLower_parametersList;
+    thermostat_clusterInfo.commands.add(setpointRaiseLower_commandInfo);
+    clusterInfoMapping.put("thermostat", thermostat_clusterInfo);
+    ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo =
+        new ClusterInfo("thermostatUserInterfaceConfiguration");
+    clusterInfoMapping.put(
+        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
+    ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo("threadNetworkDiagnostics");
+    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
+    CommandInfo resetCounts_commandInfo = new CommandInfo();
+    resetCounts_commandInfo.name = "resetCounts";
+    threadNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
+    resetCounts_commandInfo.parameters = resetCounts_parametersList;
+    threadNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
+    clusterInfoMapping.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
+    ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo("wakeOnLan");
+    clusterInfoMapping.put("wakeOnLan", wakeOnLan_clusterInfo);
+    ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo("wiFiNetworkDiagnostics");
+    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
+    CommandInfo resetCounts_commandInfo = new CommandInfo();
+    resetCounts_commandInfo.name = "resetCounts";
+    wiFiNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
+    resetCounts_commandInfo.parameters = resetCounts_parametersList;
+    wiFiNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
+    clusterInfoMapping.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
+    ClusterInfo windowCovering_clusterInfo = new ClusterInfo("windowCovering");
+    List<CommandParameter> downOrClose_parametersList = new ArrayList<>();
+    CommandInfo downOrClose_commandInfo = new CommandInfo();
+    downOrClose_commandInfo.name = "downOrClose";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    downOrClose_commandInfo.parameters = downOrClose_parametersList;
+    windowCovering_clusterInfo.commands.add(downOrClose_commandInfo);
+    List<CommandParameter> goToLiftPercentage_parametersList = new ArrayList<>();
+    CommandInfo goToLiftPercentage_commandInfo = new CommandInfo();
+    goToLiftPercentage_commandInfo.name = "goToLiftPercentage";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter liftPercentageValue_commandParameter =
+        new CommandParameter("liftPercentageValue", int.class);
+    goToLiftPercentage_parametersList.add(liftPercentageValue_commandParameter);
+
+    CommandParameter liftPercent100thsValue_commandParameter =
+        new CommandParameter("liftPercent100thsValue", int.class);
+    goToLiftPercentage_parametersList.add(liftPercent100thsValue_commandParameter);
+
+    goToLiftPercentage_commandInfo.parameters = goToLiftPercentage_parametersList;
+    windowCovering_clusterInfo.commands.add(goToLiftPercentage_commandInfo);
+    List<CommandParameter> goToLiftValue_parametersList = new ArrayList<>();
+    CommandInfo goToLiftValue_commandInfo = new CommandInfo();
+    goToLiftValue_commandInfo.name = "goToLiftValue";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter liftValue_commandParameter = new CommandParameter("liftValue", int.class);
+    goToLiftValue_parametersList.add(liftValue_commandParameter);
+
+    goToLiftValue_commandInfo.parameters = goToLiftValue_parametersList;
+    windowCovering_clusterInfo.commands.add(goToLiftValue_commandInfo);
+    List<CommandParameter> goToTiltPercentage_parametersList = new ArrayList<>();
+    CommandInfo goToTiltPercentage_commandInfo = new CommandInfo();
+    goToTiltPercentage_commandInfo.name = "goToTiltPercentage";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter tiltPercentageValue_commandParameter =
+        new CommandParameter("tiltPercentageValue", int.class);
+    goToTiltPercentage_parametersList.add(tiltPercentageValue_commandParameter);
+
+    CommandParameter tiltPercent100thsValue_commandParameter =
+        new CommandParameter("tiltPercent100thsValue", int.class);
+    goToTiltPercentage_parametersList.add(tiltPercent100thsValue_commandParameter);
+
+    goToTiltPercentage_commandInfo.parameters = goToTiltPercentage_parametersList;
+    windowCovering_clusterInfo.commands.add(goToTiltPercentage_commandInfo);
+    List<CommandParameter> goToTiltValue_parametersList = new ArrayList<>();
+    CommandInfo goToTiltValue_commandInfo = new CommandInfo();
+    goToTiltValue_commandInfo.name = "goToTiltValue";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    CommandParameter tiltValue_commandParameter = new CommandParameter("tiltValue", int.class);
+    goToTiltValue_parametersList.add(tiltValue_commandParameter);
+
+    goToTiltValue_commandInfo.parameters = goToTiltValue_parametersList;
+    windowCovering_clusterInfo.commands.add(goToTiltValue_commandInfo);
+    List<CommandParameter> stopMotion_parametersList = new ArrayList<>();
+    CommandInfo stopMotion_commandInfo = new CommandInfo();
+    stopMotion_commandInfo.name = "stopMotion";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    stopMotion_commandInfo.parameters = stopMotion_parametersList;
+    windowCovering_clusterInfo.commands.add(stopMotion_commandInfo);
+    List<CommandParameter> upOrOpen_parametersList = new ArrayList<>();
+    CommandInfo upOrOpen_commandInfo = new CommandInfo();
+    upOrOpen_commandInfo.name = "upOrOpen";
+    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
+    upOrOpen_commandInfo.parameters = upOrOpen_parametersList;
+    windowCovering_clusterInfo.commands.add(upOrOpen_commandInfo);
+    clusterInfoMapping.put("windowCovering", windowCovering_clusterInfo);
+  }
+}

From dfbd73665db81ffaba67dac0dd29fabe71271cc4 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 14 Oct 2021 15:51:37 -0400
Subject: [PATCH 02/38] change package

---
 src/android/CHIPTool/.idea/misc.xml                           | 2 +-
 .../chip/chiptool/clusterclient/ClusterInteractionFragment.kt | 4 ++++
 src/controller/java/BUILD.gn                                  | 4 ++++
 src/controller/java/src/chip/clusterinfo/ClusterInfo.java     | 4 ++++
 src/controller/java/src/chip/clusterinfo/CommandInfo.java     | 4 ++++
 .../java/src/chip/clusterinfo/CommandParameter.java           | 2 +-
 src/controller/java/src/chip/clusterinfo/ParameterType.java   | 2 +-
 7 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/android/CHIPTool/.idea/misc.xml b/src/android/CHIPTool/.idea/misc.xml
index 1b6dac9046a121..6199cc2a4d0e4f 100644
--- a/src/android/CHIPTool/.idea/misc.xml
+++ b/src/android/CHIPTool/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index 2b05e7815aecf7..21cb86d0ab4a3a 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -18,11 +18,15 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
+<<<<<<< HEAD
 import chip.devicecontroller.ClusterInfoMapping
 import java.lang.Exception
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 
+=======
+import
+>>>>>>> 505e97db3 (change package)
 
 class ClusterInteractionFragment : Fragment() {
   private val deviceController: ChipDeviceController
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 784271dbd97cde..67b3c0b089e1c2 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -69,6 +69,10 @@ android_library("java") {
     "src/chip/devicecontroller/ChipDeviceControllerException.java",
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
+    "src/chip/clusterinfo/ClusterInfo.java",
+    "src/chip/clusterinfo/CommandInfo.java",
+    "src/chip/clusterinfo/CommandParameter.java",
+    "src/chip/clusterinfo/ParameterType.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
 <<<<<<< HEAD
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 9df3365b36a62c..21703ee00b5e34 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 package chip.clusterinfo;
 
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
@@ -34,6 +35,9 @@ public interface ClusterConstructor {
 }
 =======
 package chip.devicecontroller;
+=======
+package chip.clusterinfo;
+>>>>>>> 505e97db3 (change package)
 
 public class ClusterInfo {
 
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 3a147273f073ca..5ae0d5b58a90d3 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 package chip.clusterinfo;
 
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
@@ -50,6 +51,9 @@ void invokeCommand(
 }
 =======
 package chip.devicecontroller;
+=======
+package chip.clusterinfo;
+>>>>>>> 505e97db3 (change package)
 
 
 public class CommandInfo {
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameter.java b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
index 053dd80f55291c..e75e3f671d88bc 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameter.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
@@ -1,4 +1,4 @@
-package chip.devicecontroller;
+package chip.clusterinfo;
 
 public class CommandParameter {
   public CommandParameter() {}
diff --git a/src/controller/java/src/chip/clusterinfo/ParameterType.java b/src/controller/java/src/chip/clusterinfo/ParameterType.java
index 2b31ea19fd4ca7..b9a4df60c0dfda 100644
--- a/src/controller/java/src/chip/clusterinfo/ParameterType.java
+++ b/src/controller/java/src/chip/clusterinfo/ParameterType.java
@@ -1,4 +1,4 @@
-package chip.devicecontroller;
+package chip.clusterinfo;
 
 enum ParameterType {
   CALLBACK, INT, LONG, BOOLEAN, STRUCT

From 8abefbdf0022cebdaf6081ffbb796edeea5001bb Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 14 Oct 2021 18:01:52 -0400
Subject: [PATCH 03/38] no error code generation

---
 src/android/CHIPTool/.idea/misc.xml           |    8 +
 .../ClusterInteractionFragment.kt             |   23 +-
 src/controller/java/BUILD.gn                  |    4 +
 .../src/chip/clusterinfo/ClusterInfo.java     |    6 +-
 .../src/chip/clusterinfo/CommandInfo.java     |   15 +-
 .../chip/clusterinfo/CommandParameter.java    |    4 +-
 .../java/templates/ClusterInfo-java.zapt      |   37 +-
 src/controller/java/templates/templates.json  |    4 +
 .../chip/devicecontroller/ClusterInfo.java    | 2139 -------------
 .../devicecontroller/ClusterInfoMapping.java  | 2646 +++++++++++++++++
 10 files changed, 2729 insertions(+), 2157 deletions(-)
 delete mode 100644 src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java

diff --git a/src/android/CHIPTool/.idea/misc.xml b/src/android/CHIPTool/.idea/misc.xml
index 6199cc2a4d0e4f..e3c149217d32ba 100644
--- a/src/android/CHIPTool/.idea/misc.xml
+++ b/src/android/CHIPTool/.idea/misc.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/cluster_interaction_fragment.xml" value="0.18229166666666666" />
+        <entry key="app/src/main/res/layout/on_off_client_fragment.xml" value="0.18229166666666666" />
+      </map>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index 21cb86d0ab4a3a..a7fa9823bd90b5 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -1,11 +1,11 @@
 package com.google.chip.chiptool.clusterclient
 
+import android.app.AlertDialog
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.fragment.app.Fragment
 import chip.clusterinfo.ClusterCommandCallback
 import chip.clusterinfo.ClusterInfo
@@ -19,6 +19,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 <<<<<<< HEAD
+<<<<<<< HEAD
 import chip.devicecontroller.ClusterInfoMapping
 import java.lang.Exception
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
@@ -27,6 +28,11 @@ import kotlinx.coroutines.launch
 =======
 import
 >>>>>>> 505e97db3 (change package)
+=======
+import chip.devicecontroller.ClusterInfoMapping
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
+import kotlinx.coroutines.launch
+>>>>>>> a4fd0282e (no error code generation)
 
 class ClusterInteractionFragment : Fragment() {
   private val deviceController: ChipDeviceController
@@ -34,7 +40,10 @@ class ClusterInteractionFragment : Fragment() {
 
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
+<<<<<<< HEAD
   private lateinit var clusterMap: Map<String, ClusterInfo>
+=======
+>>>>>>> a4fd0282e (no error code generation)
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -45,6 +54,7 @@ class ClusterInteractionFragment : Fragment() {
       deviceController.setCompletionListener(ChipControllerCallback())
       addressUpdateFragment =
         childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
+<<<<<<< HEAD
       clusterMap = ClusterInfoMapping().clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
     }
@@ -83,6 +93,17 @@ class ClusterInteractionFragment : Fragment() {
   private fun showMessage(msg: String) {
     requireActivity().runOnUiThread {
       Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+=======
+      getClusterMappingBtn.setOnClickListener { getClusterMapping()}
+    }
+  }
+
+  private fun getClusterMapping() {
+    val clusterInfoMapping = ClusterInfoMapping();
+    val test = clusterInfoMapping.clusterMap;
+    for ((key, value) in test.entries) {
+      println("${key}=$value")
+>>>>>>> a4fd0282e (no error code generation)
     }
   }
 
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 67b3c0b089e1c2..5ed60af753f275 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -74,11 +74,15 @@ android_library("java") {
     "src/chip/clusterinfo/CommandParameter.java",
     "src/chip/clusterinfo/ParameterType.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
 =======
     "zap-generated/chip/devicecontroller/ClusterInfo.java",
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
+>>>>>>> a4fd0282e (no error code generation)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 21703ee00b5e34..5a48fa36b7aa9a 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
 
@@ -38,6 +39,9 @@ public interface ClusterConstructor {
 =======
 package chip.clusterinfo;
 >>>>>>> 505e97db3 (change package)
+=======
+import java.util.*;
+>>>>>>> a4fd0282e (no error code generation)
 
 public class ClusterInfo {
 
@@ -46,7 +50,7 @@ public ClusterInfo(String name) {
     this.commands = new ArrayList<CommandInfo>();
   }
   public String name;
-  public Class<T> clusterClass;
+  public Class<?> clusterClass;
   public List<CommandInfo> commands;
 
 }
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 5ae0d5b58a90d3..c7920952a17bb7 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
 import java.util.function.Supplier;
@@ -54,10 +55,15 @@ void invokeCommand(
 =======
 package chip.clusterinfo;
 >>>>>>> 505e97db3 (change package)
+=======
+import java.util.function.Function;
+import java.util.*;
+>>>>>>> a4fd0282e (no error code generation)
 
 
 public class CommandInfo {
-  public CommandInfo(String name, Function<List<CommandParameter>, ClusterResponse> fn, List<CommandParameter> parameters, Class callbackClass) {
+  // TODO make Class<?> to ClusterResponse
+  public CommandInfo(String name, Function<List<CommandParameter>, Class<?>> fn, List<CommandParameter> parameters, Class<?> callbackClass) {
     this.name = name;
     this.fn = fn;
     this.parameters = parameters;
@@ -66,8 +72,13 @@ public CommandInfo(String name, Function<List<CommandParameter>, ClusterResponse
   public CommandInfo() {}
 
   public String name;
-  public Function<List<CommandParameter>, ClusterResponse> fn;
+  public Function<List<CommandParameter>, Class<?>> fn;
   public List<CommandParameter> parameters;
+<<<<<<< HEAD
   public Class callbackClass;
 }
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+  public Class<?> callbackClass;
+}
+>>>>>>> a4fd0282e (no error code generation)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameter.java b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
index e75e3f671d88bc..ef192e1923cd89 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameter.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
@@ -3,11 +3,11 @@
 public class CommandParameter {
   public CommandParameter() {}
 
-  public CommandParameter(String name, ParameterType type) {
+  public CommandParameter(String name, Class<?> type) {
     this.name = name;
     this.type = type;
   }
 
   public String name;
-  public ParameterType type;
+  public Class<?> type;
 }
\ No newline at end of file
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 8675b61b7d9bf6..495bc119df16ac 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -3,6 +3,7 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -150,41 +151,53 @@ public class ClusterInfoMapping {
      return clusterMap;
 =======
 import java.util.List;
+=======
+import java.util.*;
+import chip.clusterinfo.ClusterInfo;
+import chip.clusterinfo.CommandInfo;
+import chip.clusterinfo.CommandParameter;
+import chip.clusterinfo.ParameterType;
+
+>>>>>>> a4fd0282e (no error code generation)
 
 public class ClusterInfoMapping {
 
  public Map<String, ClusterInfo> getClusterMap() {
-     Map<String, ClusterInfo> clusterInfoMapping = new Hashmap<>();
+     Map<String, ClusterInfo> clusterInfoMapping = new HashMap<>();
      {{#chip_client_clusters}}
      ClusterInfo {{asLowerCamelCase name}}_clusterInfo = new ClusterInfo("{{asLowerCamelCase name}}");
      {{#chip_cluster_commands}}
-           List<CommandParameter> {{asLowerCamelCase name}}_parametersList = new ArrayList<>();
-           CommandInfo {{asLowerCamelCase name}}_commandInfo = new CommandInfo();
-           {{asLowerCamelCase name}}_commandInfo.name = "{{asLowerCamelCase name}}";
+           List<CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_parametersList = new ArrayList<>();
+           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo = new CommandInfo();
+           {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.name = "{{asLowerCamelCase name}}";
            {{#if (zcl_command_arguments_count this.id)}}
                {{#if hasSpecificResponse}}
-                 {{asLowerCamelCase ../name}}_commandInfo.callbackClass = {{asUpperCamelCase responseName}}Callback.class;
+                 {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class;
                {{else}}
-                 {{asLowerCamelCase ../name}}_commandInfo.callbackClass = DefaultClusterCallback.class;
+                 {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
                {{/if}}
                {{#chip_cluster_command_arguments}}
-                 CommandParameter {{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../name}}_parametersList.add({{asLowerCamelCase label}}_commandParameter);
+                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_parametersList.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
                  {{#not_last}} {{/not_last}}
                {{/chip_cluster_command_arguments}}
            {{else}}
              {{#if hasSpecificResponse}}
-               {{asLowerCamelCase ../name}}_commandInfo.callbackClass = {{asUpperCamelCase responseName}}Callback.class;
+               {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class;
              {{else}}
-               {{asLowerCamelCase ../name}}_commandInfo.callbackClass = DefaultClusterCallback.class;
+               {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
              {{/if}}
            {{/if}}
-           {{asLowerCamelCase name}}_commandInfo.parameters = {{asLowerCamelCase name}}_parametersList;
-           {{asLowerCamelCase ../name}}_clusterInfo.commands.add({{asLowerCamelCase name}}_commandInfo);
+           {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.parameters = {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_parametersList;
+           {{asLowerCamelCase ../name}}_clusterInfo.commands.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo);
      {{/chip_cluster_commands}}
      clusterInfoMapping.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}_clusterInfo);
      {{/chip_client_clusters}}
+<<<<<<< HEAD
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+     return clusterInfoMapping;
+>>>>>>> a4fd0282e (no error code generation)
   }
 }
 
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index 57bf0a5d6eb8bd..2cd0f16bf7adbe 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -43,8 +43,12 @@
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
 =======
             "name": "ClusterInfo Maping for Java",
+<<<<<<< HEAD
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java"
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+            "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
+>>>>>>> a4fd0282e (no error code generation)
         }
     ]
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java
deleted file mode 100644
index 0c578a6f5d3e65..00000000000000
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java
+++ /dev/null
@@ -1,2139 +0,0 @@
-/*
- *
- *    Copyright (c) 2021 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-// THIS FILE IS GENERATED BY ZAP
-
-package chip.devicecontroller;
-
-import java.util.List;
-
-public class ClusterInfoMapping {
-
-  public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterInfoMapping = new Hashmap<>();
-    ClusterInfo accountLogin_clusterInfo = new ClusterInfo("accountLogin");
-    List<CommandParameter> getSetupPIN_parametersList = new ArrayList<>();
-    CommandInfo getSetupPIN_commandInfo = new CommandInfo();
-    getSetupPIN_commandInfo.name = "getSetupPIN";
-    accountLogin_commandInfo.callbackClass = GetSetupPINResponseCallback.class;
-    CommandParameter tempAccountIdentifier_commandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-    getSetupPIN_parametersList.add(tempAccountIdentifier_commandParameter);
-
-    getSetupPIN_commandInfo.parameters = getSetupPIN_parametersList;
-    accountLogin_clusterInfo.commands.add(getSetupPIN_commandInfo);
-    List<CommandParameter> login_parametersList = new ArrayList<>();
-    CommandInfo login_commandInfo = new CommandInfo();
-    login_commandInfo.name = "login";
-    accountLogin_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter tempAccountIdentifier_commandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-    login_parametersList.add(tempAccountIdentifier_commandParameter);
-
-    CommandParameter setupPIN_commandParameter = new CommandParameter("setupPIN", String.class);
-    login_parametersList.add(setupPIN_commandParameter);
-
-    login_commandInfo.parameters = login_parametersList;
-    accountLogin_clusterInfo.commands.add(login_commandInfo);
-    clusterInfoMapping.put("accountLogin", accountLogin_clusterInfo);
-    ClusterInfo administratorCommissioning_clusterInfo =
-        new ClusterInfo("administratorCommissioning");
-    List<CommandParameter> openBasicCommissioningWindow_parametersList = new ArrayList<>();
-    CommandInfo openBasicCommissioningWindow_commandInfo = new CommandInfo();
-    openBasicCommissioningWindow_commandInfo.name = "openBasicCommissioningWindow";
-    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    openBasicCommissioningWindow_parametersList.add(commissioningTimeout_commandParameter);
-
-    openBasicCommissioningWindow_commandInfo.parameters =
-        openBasicCommissioningWindow_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(openBasicCommissioningWindow_commandInfo);
-    List<CommandParameter> openCommissioningWindow_parametersList = new ArrayList<>();
-    CommandInfo openCommissioningWindow_commandInfo = new CommandInfo();
-    openCommissioningWindow_commandInfo.name = "openCommissioningWindow";
-    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    openCommissioningWindow_parametersList.add(commissioningTimeout_commandParameter);
-
-    CommandParameter PAKEVerifier_commandParameter =
-        new CommandParameter("PAKEVerifier", byte[].class);
-    openCommissioningWindow_parametersList.add(PAKEVerifier_commandParameter);
-
-    CommandParameter discriminator_commandParameter =
-        new CommandParameter("discriminator", int.class);
-    openCommissioningWindow_parametersList.add(discriminator_commandParameter);
-
-    CommandParameter iterations_commandParameter = new CommandParameter("iterations", long.class);
-    openCommissioningWindow_parametersList.add(iterations_commandParameter);
-
-    CommandParameter salt_commandParameter = new CommandParameter("salt", byte[].class);
-    openCommissioningWindow_parametersList.add(salt_commandParameter);
-
-    CommandParameter passcodeID_commandParameter = new CommandParameter("passcodeID", int.class);
-    openCommissioningWindow_parametersList.add(passcodeID_commandParameter);
-
-    openCommissioningWindow_commandInfo.parameters = openCommissioningWindow_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(openCommissioningWindow_commandInfo);
-    List<CommandParameter> revokeCommissioning_parametersList = new ArrayList<>();
-    CommandInfo revokeCommissioning_commandInfo = new CommandInfo();
-    revokeCommissioning_commandInfo.name = "revokeCommissioning";
-    administratorCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
-    revokeCommissioning_commandInfo.parameters = revokeCommissioning_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(revokeCommissioning_commandInfo);
-    clusterInfoMapping.put("administratorCommissioning", administratorCommissioning_clusterInfo);
-    ClusterInfo applicationBasic_clusterInfo = new ClusterInfo("applicationBasic");
-    List<CommandParameter> changeStatus_parametersList = new ArrayList<>();
-    CommandInfo changeStatus_commandInfo = new CommandInfo();
-    changeStatus_commandInfo.name = "changeStatus";
-    applicationBasic_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter status_commandParameter = new CommandParameter("status", int.class);
-    changeStatus_parametersList.add(status_commandParameter);
-
-    changeStatus_commandInfo.parameters = changeStatus_parametersList;
-    applicationBasic_clusterInfo.commands.add(changeStatus_commandInfo);
-    clusterInfoMapping.put("applicationBasic", applicationBasic_clusterInfo);
-    ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo("applicationLauncher");
-    List<CommandParameter> launchApp_parametersList = new ArrayList<>();
-    CommandInfo launchApp_commandInfo = new CommandInfo();
-    launchApp_commandInfo.name = "launchApp";
-    applicationLauncher_commandInfo.callbackClass = LaunchAppResponseCallback.class;
-    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
-    launchApp_parametersList.add(data_commandParameter);
-
-    CommandParameter catalogVendorId_commandParameter =
-        new CommandParameter("catalogVendorId", int.class);
-    launchApp_parametersList.add(catalogVendorId_commandParameter);
-
-    CommandParameter applicationId_commandParameter =
-        new CommandParameter("applicationId", String.class);
-    launchApp_parametersList.add(applicationId_commandParameter);
-
-    launchApp_commandInfo.parameters = launchApp_parametersList;
-    applicationLauncher_clusterInfo.commands.add(launchApp_commandInfo);
-    clusterInfoMapping.put("applicationLauncher", applicationLauncher_clusterInfo);
-    ClusterInfo audioOutput_clusterInfo = new ClusterInfo("audioOutput");
-    List<CommandParameter> renameOutput_parametersList = new ArrayList<>();
-    CommandInfo renameOutput_commandInfo = new CommandInfo();
-    renameOutput_commandInfo.name = "renameOutput";
-    audioOutput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
-    renameOutput_parametersList.add(index_commandParameter);
-
-    CommandParameter name_commandParameter = new CommandParameter("name", String.class);
-    renameOutput_parametersList.add(name_commandParameter);
-
-    renameOutput_commandInfo.parameters = renameOutput_parametersList;
-    audioOutput_clusterInfo.commands.add(renameOutput_commandInfo);
-    List<CommandParameter> selectOutput_parametersList = new ArrayList<>();
-    CommandInfo selectOutput_commandInfo = new CommandInfo();
-    selectOutput_commandInfo.name = "selectOutput";
-    audioOutput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
-    selectOutput_parametersList.add(index_commandParameter);
-
-    selectOutput_commandInfo.parameters = selectOutput_parametersList;
-    audioOutput_clusterInfo.commands.add(selectOutput_commandInfo);
-    clusterInfoMapping.put("audioOutput", audioOutput_clusterInfo);
-    ClusterInfo barrierControl_clusterInfo = new ClusterInfo("barrierControl");
-    List<CommandParameter> barrierControlGoToPercent_parametersList = new ArrayList<>();
-    CommandInfo barrierControlGoToPercent_commandInfo = new CommandInfo();
-    barrierControlGoToPercent_commandInfo.name = "barrierControlGoToPercent";
-    barrierControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter percentOpen_commandParameter = new CommandParameter("percentOpen", int.class);
-    barrierControlGoToPercent_parametersList.add(percentOpen_commandParameter);
-
-    barrierControlGoToPercent_commandInfo.parameters = barrierControlGoToPercent_parametersList;
-    barrierControl_clusterInfo.commands.add(barrierControlGoToPercent_commandInfo);
-    List<CommandParameter> barrierControlStop_parametersList = new ArrayList<>();
-    CommandInfo barrierControlStop_commandInfo = new CommandInfo();
-    barrierControlStop_commandInfo.name = "barrierControlStop";
-    barrierControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    barrierControlStop_commandInfo.parameters = barrierControlStop_parametersList;
-    barrierControl_clusterInfo.commands.add(barrierControlStop_commandInfo);
-    clusterInfoMapping.put("barrierControl", barrierControl_clusterInfo);
-    ClusterInfo basic_clusterInfo = new ClusterInfo("basic");
-    List<CommandParameter> mfgSpecificPing_parametersList = new ArrayList<>();
-    CommandInfo mfgSpecificPing_commandInfo = new CommandInfo();
-    mfgSpecificPing_commandInfo.name = "mfgSpecificPing";
-    basic_commandInfo.callbackClass = DefaultClusterCallback.class;
-    mfgSpecificPing_commandInfo.parameters = mfgSpecificPing_parametersList;
-    basic_clusterInfo.commands.add(mfgSpecificPing_commandInfo);
-    clusterInfoMapping.put("basic", basic_clusterInfo);
-    ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo("binaryInputBasic");
-    clusterInfoMapping.put("binaryInputBasic", binaryInputBasic_clusterInfo);
-    ClusterInfo binding_clusterInfo = new ClusterInfo("binding");
-    List<CommandParameter> bind_parametersList = new ArrayList<>();
-    CommandInfo bind_commandInfo = new CommandInfo();
-    bind_commandInfo.name = "bind";
-    binding_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    bind_parametersList.add(nodeId_commandParameter);
-
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    bind_parametersList.add(groupId_commandParameter);
-
-    CommandParameter endpointId_commandParameter = new CommandParameter("endpointId", int.class);
-    bind_parametersList.add(endpointId_commandParameter);
-
-    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-    bind_parametersList.add(clusterId_commandParameter);
-
-    bind_commandInfo.parameters = bind_parametersList;
-    binding_clusterInfo.commands.add(bind_commandInfo);
-    List<CommandParameter> unbind_parametersList = new ArrayList<>();
-    CommandInfo unbind_commandInfo = new CommandInfo();
-    unbind_commandInfo.name = "unbind";
-    binding_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    unbind_parametersList.add(nodeId_commandParameter);
-
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    unbind_parametersList.add(groupId_commandParameter);
-
-    CommandParameter endpointId_commandParameter = new CommandParameter("endpointId", int.class);
-    unbind_parametersList.add(endpointId_commandParameter);
-
-    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-    unbind_parametersList.add(clusterId_commandParameter);
-
-    unbind_commandInfo.parameters = unbind_parametersList;
-    binding_clusterInfo.commands.add(unbind_commandInfo);
-    clusterInfoMapping.put("binding", binding_clusterInfo);
-    ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo("bridgedDeviceBasic");
-    clusterInfoMapping.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
-    ClusterInfo colorControl_clusterInfo = new ClusterInfo("colorControl");
-    List<CommandParameter> colorLoopSet_parametersList = new ArrayList<>();
-    CommandInfo colorLoopSet_commandInfo = new CommandInfo();
-    colorLoopSet_commandInfo.name = "colorLoopSet";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter updateFlags_commandParameter = new CommandParameter("updateFlags", int.class);
-    colorLoopSet_parametersList.add(updateFlags_commandParameter);
-
-    CommandParameter action_commandParameter = new CommandParameter("action", int.class);
-    colorLoopSet_parametersList.add(action_commandParameter);
-
-    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
-    colorLoopSet_parametersList.add(direction_commandParameter);
-
-    CommandParameter time_commandParameter = new CommandParameter("time", int.class);
-    colorLoopSet_parametersList.add(time_commandParameter);
-
-    CommandParameter startHue_commandParameter = new CommandParameter("startHue", int.class);
-    colorLoopSet_parametersList.add(startHue_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    colorLoopSet_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorLoopSet_parametersList.add(optionsOverride_commandParameter);
-
-    colorLoopSet_commandInfo.parameters = colorLoopSet_parametersList;
-    colorControl_clusterInfo.commands.add(colorLoopSet_commandInfo);
-    List<CommandParameter> enhancedMoveHue_parametersList = new ArrayList<>();
-    CommandInfo enhancedMoveHue_commandInfo = new CommandInfo();
-    enhancedMoveHue_commandInfo.name = "enhancedMoveHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    enhancedMoveHue_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    enhancedMoveHue_parametersList.add(rate_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    enhancedMoveHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    enhancedMoveHue_parametersList.add(optionsOverride_commandParameter);
-
-    enhancedMoveHue_commandInfo.parameters = enhancedMoveHue_parametersList;
-    colorControl_clusterInfo.commands.add(enhancedMoveHue_commandInfo);
-    List<CommandParameter> enhancedMoveToHue_parametersList = new ArrayList<>();
-    CommandInfo enhancedMoveToHue_commandInfo = new CommandInfo();
-    enhancedMoveToHue_commandInfo.name = "enhancedMoveToHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
-    enhancedMoveToHue_parametersList.add(enhancedHue_commandParameter);
-
-    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
-    enhancedMoveToHue_parametersList.add(direction_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    enhancedMoveToHue_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    enhancedMoveToHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    enhancedMoveToHue_parametersList.add(optionsOverride_commandParameter);
-
-    enhancedMoveToHue_commandInfo.parameters = enhancedMoveToHue_parametersList;
-    colorControl_clusterInfo.commands.add(enhancedMoveToHue_commandInfo);
-    List<CommandParameter> enhancedMoveToHueAndSaturation_parametersList = new ArrayList<>();
-    CommandInfo enhancedMoveToHueAndSaturation_commandInfo = new CommandInfo();
-    enhancedMoveToHueAndSaturation_commandInfo.name = "enhancedMoveToHueAndSaturation";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
-    enhancedMoveToHueAndSaturation_parametersList.add(enhancedHue_commandParameter);
-
-    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
-    enhancedMoveToHueAndSaturation_parametersList.add(saturation_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    enhancedMoveToHueAndSaturation_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    enhancedMoveToHueAndSaturation_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    enhancedMoveToHueAndSaturation_parametersList.add(optionsOverride_commandParameter);
-
-    enhancedMoveToHueAndSaturation_commandInfo.parameters =
-        enhancedMoveToHueAndSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(enhancedMoveToHueAndSaturation_commandInfo);
-    List<CommandParameter> enhancedStepHue_parametersList = new ArrayList<>();
-    CommandInfo enhancedStepHue_commandInfo = new CommandInfo();
-    enhancedStepHue_commandInfo.name = "enhancedStepHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    enhancedStepHue_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    enhancedStepHue_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    enhancedStepHue_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    enhancedStepHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    enhancedStepHue_parametersList.add(optionsOverride_commandParameter);
-
-    enhancedStepHue_commandInfo.parameters = enhancedStepHue_parametersList;
-    colorControl_clusterInfo.commands.add(enhancedStepHue_commandInfo);
-    List<CommandParameter> moveColor_parametersList = new ArrayList<>();
-    CommandInfo moveColor_commandInfo = new CommandInfo();
-    moveColor_commandInfo.name = "moveColor";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter rateX_commandParameter = new CommandParameter("rateX", int.class);
-    moveColor_parametersList.add(rateX_commandParameter);
-
-    CommandParameter rateY_commandParameter = new CommandParameter("rateY", int.class);
-    moveColor_parametersList.add(rateY_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveColor_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveColor_parametersList.add(optionsOverride_commandParameter);
-
-    moveColor_commandInfo.parameters = moveColor_parametersList;
-    colorControl_clusterInfo.commands.add(moveColor_commandInfo);
-    List<CommandParameter> moveColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo moveColorTemperature_commandInfo = new CommandInfo();
-    moveColorTemperature_commandInfo.name = "moveColorTemperature";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    moveColorTemperature_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    moveColorTemperature_parametersList.add(rate_commandParameter);
-
-    CommandParameter colorTemperatureMinimum_commandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
-    moveColorTemperature_parametersList.add(colorTemperatureMinimum_commandParameter);
-
-    CommandParameter colorTemperatureMaximum_commandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
-    moveColorTemperature_parametersList.add(colorTemperatureMaximum_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveColorTemperature_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveColorTemperature_parametersList.add(optionsOverride_commandParameter);
-
-    moveColorTemperature_commandInfo.parameters = moveColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(moveColorTemperature_commandInfo);
-    List<CommandParameter> moveHue_parametersList = new ArrayList<>();
-    CommandInfo moveHue_commandInfo = new CommandInfo();
-    moveHue_commandInfo.name = "moveHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    moveHue_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    moveHue_parametersList.add(rate_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveHue_parametersList.add(optionsOverride_commandParameter);
-
-    moveHue_commandInfo.parameters = moveHue_parametersList;
-    colorControl_clusterInfo.commands.add(moveHue_commandInfo);
-    List<CommandParameter> moveSaturation_parametersList = new ArrayList<>();
-    CommandInfo moveSaturation_commandInfo = new CommandInfo();
-    moveSaturation_commandInfo.name = "moveSaturation";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    moveSaturation_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    moveSaturation_parametersList.add(rate_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveSaturation_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveSaturation_parametersList.add(optionsOverride_commandParameter);
-
-    moveSaturation_commandInfo.parameters = moveSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(moveSaturation_commandInfo);
-    List<CommandParameter> moveToColor_parametersList = new ArrayList<>();
-    CommandInfo moveToColor_commandInfo = new CommandInfo();
-    moveToColor_commandInfo.name = "moveToColor";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter colorX_commandParameter = new CommandParameter("colorX", int.class);
-    moveToColor_parametersList.add(colorX_commandParameter);
-
-    CommandParameter colorY_commandParameter = new CommandParameter("colorY", int.class);
-    moveToColor_parametersList.add(colorY_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToColor_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveToColor_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveToColor_parametersList.add(optionsOverride_commandParameter);
-
-    moveToColor_commandInfo.parameters = moveToColor_parametersList;
-    colorControl_clusterInfo.commands.add(moveToColor_commandInfo);
-    List<CommandParameter> moveToColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo moveToColorTemperature_commandInfo = new CommandInfo();
-    moveToColorTemperature_commandInfo.name = "moveToColorTemperature";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter colorTemperature_commandParameter =
-        new CommandParameter("colorTemperature", int.class);
-    moveToColorTemperature_parametersList.add(colorTemperature_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToColorTemperature_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveToColorTemperature_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveToColorTemperature_parametersList.add(optionsOverride_commandParameter);
-
-    moveToColorTemperature_commandInfo.parameters = moveToColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(moveToColorTemperature_commandInfo);
-    List<CommandParameter> moveToHue_parametersList = new ArrayList<>();
-    CommandInfo moveToHue_commandInfo = new CommandInfo();
-    moveToHue_commandInfo.name = "moveToHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter hue_commandParameter = new CommandParameter("hue", int.class);
-    moveToHue_parametersList.add(hue_commandParameter);
-
-    CommandParameter direction_commandParameter = new CommandParameter("direction", int.class);
-    moveToHue_parametersList.add(direction_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToHue_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveToHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveToHue_parametersList.add(optionsOverride_commandParameter);
-
-    moveToHue_commandInfo.parameters = moveToHue_parametersList;
-    colorControl_clusterInfo.commands.add(moveToHue_commandInfo);
-    List<CommandParameter> moveToHueAndSaturation_parametersList = new ArrayList<>();
-    CommandInfo moveToHueAndSaturation_commandInfo = new CommandInfo();
-    moveToHueAndSaturation_commandInfo.name = "moveToHueAndSaturation";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter hue_commandParameter = new CommandParameter("hue", int.class);
-    moveToHueAndSaturation_parametersList.add(hue_commandParameter);
-
-    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
-    moveToHueAndSaturation_parametersList.add(saturation_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToHueAndSaturation_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveToHueAndSaturation_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveToHueAndSaturation_parametersList.add(optionsOverride_commandParameter);
-
-    moveToHueAndSaturation_commandInfo.parameters = moveToHueAndSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(moveToHueAndSaturation_commandInfo);
-    List<CommandParameter> moveToSaturation_parametersList = new ArrayList<>();
-    CommandInfo moveToSaturation_commandInfo = new CommandInfo();
-    moveToSaturation_commandInfo.name = "moveToSaturation";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter saturation_commandParameter = new CommandParameter("saturation", int.class);
-    moveToSaturation_parametersList.add(saturation_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToSaturation_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    moveToSaturation_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    moveToSaturation_parametersList.add(optionsOverride_commandParameter);
-
-    moveToSaturation_commandInfo.parameters = moveToSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(moveToSaturation_commandInfo);
-    List<CommandParameter> stepColor_parametersList = new ArrayList<>();
-    CommandInfo stepColor_commandInfo = new CommandInfo();
-    stepColor_commandInfo.name = "stepColor";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepX_commandParameter = new CommandParameter("stepX", int.class);
-    stepColor_parametersList.add(stepX_commandParameter);
-
-    CommandParameter stepY_commandParameter = new CommandParameter("stepY", int.class);
-    stepColor_parametersList.add(stepY_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    stepColor_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    stepColor_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    stepColor_parametersList.add(optionsOverride_commandParameter);
-
-    stepColor_commandInfo.parameters = stepColor_parametersList;
-    colorControl_clusterInfo.commands.add(stepColor_commandInfo);
-    List<CommandParameter> stepColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo stepColorTemperature_commandInfo = new CommandInfo();
-    stepColorTemperature_commandInfo.name = "stepColorTemperature";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    stepColorTemperature_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    stepColorTemperature_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    stepColorTemperature_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter colorTemperatureMinimum_commandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
-    stepColorTemperature_parametersList.add(colorTemperatureMinimum_commandParameter);
-
-    CommandParameter colorTemperatureMaximum_commandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
-    stepColorTemperature_parametersList.add(colorTemperatureMaximum_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    stepColorTemperature_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    stepColorTemperature_parametersList.add(optionsOverride_commandParameter);
-
-    stepColorTemperature_commandInfo.parameters = stepColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(stepColorTemperature_commandInfo);
-    List<CommandParameter> stepHue_parametersList = new ArrayList<>();
-    CommandInfo stepHue_commandInfo = new CommandInfo();
-    stepHue_commandInfo.name = "stepHue";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    stepHue_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    stepHue_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    stepHue_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    stepHue_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    stepHue_parametersList.add(optionsOverride_commandParameter);
-
-    stepHue_commandInfo.parameters = stepHue_parametersList;
-    colorControl_clusterInfo.commands.add(stepHue_commandInfo);
-    List<CommandParameter> stepSaturation_parametersList = new ArrayList<>();
-    CommandInfo stepSaturation_commandInfo = new CommandInfo();
-    stepSaturation_commandInfo.name = "stepSaturation";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    stepSaturation_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    stepSaturation_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    stepSaturation_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    stepSaturation_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    stepSaturation_parametersList.add(optionsOverride_commandParameter);
-
-    stepSaturation_commandInfo.parameters = stepSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(stepSaturation_commandInfo);
-    List<CommandParameter> stopMoveStep_parametersList = new ArrayList<>();
-    CommandInfo stopMoveStep_commandInfo = new CommandInfo();
-    stopMoveStep_commandInfo.name = "stopMoveStep";
-    colorControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-    stopMoveStep_parametersList.add(optionsMask_commandParameter);
-
-    CommandParameter optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    stopMoveStep_parametersList.add(optionsOverride_commandParameter);
-
-    stopMoveStep_commandInfo.parameters = stopMoveStep_parametersList;
-    colorControl_clusterInfo.commands.add(stopMoveStep_commandInfo);
-    clusterInfoMapping.put("colorControl", colorControl_clusterInfo);
-    ClusterInfo contentLauncher_clusterInfo = new ClusterInfo("contentLauncher");
-    List<CommandParameter> launchContent_parametersList = new ArrayList<>();
-    CommandInfo launchContent_commandInfo = new CommandInfo();
-    launchContent_commandInfo.name = "launchContent";
-    contentLauncher_commandInfo.callbackClass = LaunchContentResponseCallback.class;
-    CommandParameter autoPlay_commandParameter = new CommandParameter("autoPlay", boolean.class);
-    launchContent_parametersList.add(autoPlay_commandParameter);
-
-    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
-    launchContent_parametersList.add(data_commandParameter);
-
-    launchContent_commandInfo.parameters = launchContent_parametersList;
-    contentLauncher_clusterInfo.commands.add(launchContent_commandInfo);
-    List<CommandParameter> launchURL_parametersList = new ArrayList<>();
-    CommandInfo launchURL_commandInfo = new CommandInfo();
-    launchURL_commandInfo.name = "launchURL";
-    contentLauncher_commandInfo.callbackClass = LaunchURLResponseCallback.class;
-    CommandParameter contentURL_commandParameter = new CommandParameter("contentURL", String.class);
-    launchURL_parametersList.add(contentURL_commandParameter);
-
-    CommandParameter displayString_commandParameter =
-        new CommandParameter("displayString", String.class);
-    launchURL_parametersList.add(displayString_commandParameter);
-
-    launchURL_commandInfo.parameters = launchURL_parametersList;
-    contentLauncher_clusterInfo.commands.add(launchURL_commandInfo);
-    clusterInfoMapping.put("contentLauncher", contentLauncher_clusterInfo);
-    ClusterInfo descriptor_clusterInfo = new ClusterInfo("descriptor");
-    clusterInfoMapping.put("descriptor", descriptor_clusterInfo);
-    ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo("diagnosticLogs");
-    List<CommandParameter> retrieveLogsRequest_parametersList = new ArrayList<>();
-    CommandInfo retrieveLogsRequest_commandInfo = new CommandInfo();
-    retrieveLogsRequest_commandInfo.name = "retrieveLogsRequest";
-    diagnosticLogs_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter intent_commandParameter = new CommandParameter("intent", int.class);
-    retrieveLogsRequest_parametersList.add(intent_commandParameter);
-
-    CommandParameter requestedProtocol_commandParameter =
-        new CommandParameter("requestedProtocol", int.class);
-    retrieveLogsRequest_parametersList.add(requestedProtocol_commandParameter);
-
-    CommandParameter transferFileDesignator_commandParameter =
-        new CommandParameter("transferFileDesignator", byte[].class);
-    retrieveLogsRequest_parametersList.add(transferFileDesignator_commandParameter);
-
-    retrieveLogsRequest_commandInfo.parameters = retrieveLogsRequest_parametersList;
-    diagnosticLogs_clusterInfo.commands.add(retrieveLogsRequest_commandInfo);
-    clusterInfoMapping.put("diagnosticLogs", diagnosticLogs_clusterInfo);
-    ClusterInfo doorLock_clusterInfo = new ClusterInfo("doorLock");
-    List<CommandParameter> clearAllPins_parametersList = new ArrayList<>();
-    CommandInfo clearAllPins_commandInfo = new CommandInfo();
-    clearAllPins_commandInfo.name = "clearAllPins";
-    doorLock_commandInfo.callbackClass = ClearAllPinsResponseCallback.class;
-    clearAllPins_commandInfo.parameters = clearAllPins_parametersList;
-    doorLock_clusterInfo.commands.add(clearAllPins_commandInfo);
-    List<CommandParameter> clearAllRfids_parametersList = new ArrayList<>();
-    CommandInfo clearAllRfids_commandInfo = new CommandInfo();
-    clearAllRfids_commandInfo.name = "clearAllRfids";
-    doorLock_commandInfo.callbackClass = ClearAllRfidsResponseCallback.class;
-    clearAllRfids_commandInfo.parameters = clearAllRfids_parametersList;
-    doorLock_clusterInfo.commands.add(clearAllRfids_commandInfo);
-    List<CommandParameter> clearHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo clearHolidaySchedule_commandInfo = new CommandInfo();
-    clearHolidaySchedule_commandInfo.name = "clearHolidaySchedule";
-    doorLock_commandInfo.callbackClass = ClearHolidayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    clearHolidaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    clearHolidaySchedule_commandInfo.parameters = clearHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(clearHolidaySchedule_commandInfo);
-    List<CommandParameter> clearPin_parametersList = new ArrayList<>();
-    CommandInfo clearPin_commandInfo = new CommandInfo();
-    clearPin_commandInfo.name = "clearPin";
-    doorLock_commandInfo.callbackClass = ClearPinResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    clearPin_parametersList.add(userId_commandParameter);
-
-    clearPin_commandInfo.parameters = clearPin_parametersList;
-    doorLock_clusterInfo.commands.add(clearPin_commandInfo);
-    List<CommandParameter> clearRfid_parametersList = new ArrayList<>();
-    CommandInfo clearRfid_commandInfo = new CommandInfo();
-    clearRfid_commandInfo.name = "clearRfid";
-    doorLock_commandInfo.callbackClass = ClearRfidResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    clearRfid_parametersList.add(userId_commandParameter);
-
-    clearRfid_commandInfo.parameters = clearRfid_parametersList;
-    doorLock_clusterInfo.commands.add(clearRfid_commandInfo);
-    List<CommandParameter> clearWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo clearWeekdaySchedule_commandInfo = new CommandInfo();
-    clearWeekdaySchedule_commandInfo.name = "clearWeekdaySchedule";
-    doorLock_commandInfo.callbackClass = ClearWeekdayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    clearWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    clearWeekdaySchedule_parametersList.add(userId_commandParameter);
-
-    clearWeekdaySchedule_commandInfo.parameters = clearWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(clearWeekdaySchedule_commandInfo);
-    List<CommandParameter> clearYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo clearYeardaySchedule_commandInfo = new CommandInfo();
-    clearYeardaySchedule_commandInfo.name = "clearYeardaySchedule";
-    doorLock_commandInfo.callbackClass = ClearYeardayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    clearYeardaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    clearYeardaySchedule_parametersList.add(userId_commandParameter);
-
-    clearYeardaySchedule_commandInfo.parameters = clearYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(clearYeardaySchedule_commandInfo);
-    List<CommandParameter> getHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo getHolidaySchedule_commandInfo = new CommandInfo();
-    getHolidaySchedule_commandInfo.name = "getHolidaySchedule";
-    doorLock_commandInfo.callbackClass = GetHolidayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    getHolidaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    getHolidaySchedule_commandInfo.parameters = getHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(getHolidaySchedule_commandInfo);
-    List<CommandParameter> getLogRecord_parametersList = new ArrayList<>();
-    CommandInfo getLogRecord_commandInfo = new CommandInfo();
-    getLogRecord_commandInfo.name = "getLogRecord";
-    doorLock_commandInfo.callbackClass = GetLogRecordResponseCallback.class;
-    CommandParameter logIndex_commandParameter = new CommandParameter("logIndex", int.class);
-    getLogRecord_parametersList.add(logIndex_commandParameter);
-
-    getLogRecord_commandInfo.parameters = getLogRecord_parametersList;
-    doorLock_clusterInfo.commands.add(getLogRecord_commandInfo);
-    List<CommandParameter> getPin_parametersList = new ArrayList<>();
-    CommandInfo getPin_commandInfo = new CommandInfo();
-    getPin_commandInfo.name = "getPin";
-    doorLock_commandInfo.callbackClass = GetPinResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    getPin_parametersList.add(userId_commandParameter);
-
-    getPin_commandInfo.parameters = getPin_parametersList;
-    doorLock_clusterInfo.commands.add(getPin_commandInfo);
-    List<CommandParameter> getRfid_parametersList = new ArrayList<>();
-    CommandInfo getRfid_commandInfo = new CommandInfo();
-    getRfid_commandInfo.name = "getRfid";
-    doorLock_commandInfo.callbackClass = GetRfidResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    getRfid_parametersList.add(userId_commandParameter);
-
-    getRfid_commandInfo.parameters = getRfid_parametersList;
-    doorLock_clusterInfo.commands.add(getRfid_commandInfo);
-    List<CommandParameter> getUserType_parametersList = new ArrayList<>();
-    CommandInfo getUserType_commandInfo = new CommandInfo();
-    getUserType_commandInfo.name = "getUserType";
-    doorLock_commandInfo.callbackClass = GetUserTypeResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    getUserType_parametersList.add(userId_commandParameter);
-
-    getUserType_commandInfo.parameters = getUserType_parametersList;
-    doorLock_clusterInfo.commands.add(getUserType_commandInfo);
-    List<CommandParameter> getWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo getWeekdaySchedule_commandInfo = new CommandInfo();
-    getWeekdaySchedule_commandInfo.name = "getWeekdaySchedule";
-    doorLock_commandInfo.callbackClass = GetWeekdayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    getWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    getWeekdaySchedule_parametersList.add(userId_commandParameter);
-
-    getWeekdaySchedule_commandInfo.parameters = getWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(getWeekdaySchedule_commandInfo);
-    List<CommandParameter> getYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo getYeardaySchedule_commandInfo = new CommandInfo();
-    getYeardaySchedule_commandInfo.name = "getYeardaySchedule";
-    doorLock_commandInfo.callbackClass = GetYeardayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    getYeardaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    getYeardaySchedule_parametersList.add(userId_commandParameter);
-
-    getYeardaySchedule_commandInfo.parameters = getYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(getYeardaySchedule_commandInfo);
-    List<CommandParameter> lockDoor_parametersList = new ArrayList<>();
-    CommandInfo lockDoor_commandInfo = new CommandInfo();
-    lockDoor_commandInfo.name = "lockDoor";
-    doorLock_commandInfo.callbackClass = LockDoorResponseCallback.class;
-    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
-    lockDoor_parametersList.add(pin_commandParameter);
-
-    lockDoor_commandInfo.parameters = lockDoor_parametersList;
-    doorLock_clusterInfo.commands.add(lockDoor_commandInfo);
-    List<CommandParameter> setHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo setHolidaySchedule_commandInfo = new CommandInfo();
-    setHolidaySchedule_commandInfo.name = "setHolidaySchedule";
-    doorLock_commandInfo.callbackClass = SetHolidayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    setHolidaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter localStartTime_commandParameter =
-        new CommandParameter("localStartTime", long.class);
-    setHolidaySchedule_parametersList.add(localStartTime_commandParameter);
-
-    CommandParameter localEndTime_commandParameter =
-        new CommandParameter("localEndTime", long.class);
-    setHolidaySchedule_parametersList.add(localEndTime_commandParameter);
-
-    CommandParameter operatingModeDuringHoliday_commandParameter =
-        new CommandParameter("operatingModeDuringHoliday", int.class);
-    setHolidaySchedule_parametersList.add(operatingModeDuringHoliday_commandParameter);
-
-    setHolidaySchedule_commandInfo.parameters = setHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(setHolidaySchedule_commandInfo);
-    List<CommandParameter> setPin_parametersList = new ArrayList<>();
-    CommandInfo setPin_commandInfo = new CommandInfo();
-    setPin_commandInfo.name = "setPin";
-    doorLock_commandInfo.callbackClass = SetPinResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    setPin_parametersList.add(userId_commandParameter);
-
-    CommandParameter userStatus_commandParameter = new CommandParameter("userStatus", int.class);
-    setPin_parametersList.add(userStatus_commandParameter);
-
-    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
-    setPin_parametersList.add(userType_commandParameter);
-
-    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
-    setPin_parametersList.add(pin_commandParameter);
-
-    setPin_commandInfo.parameters = setPin_parametersList;
-    doorLock_clusterInfo.commands.add(setPin_commandInfo);
-    List<CommandParameter> setRfid_parametersList = new ArrayList<>();
-    CommandInfo setRfid_commandInfo = new CommandInfo();
-    setRfid_commandInfo.name = "setRfid";
-    doorLock_commandInfo.callbackClass = SetRfidResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    setRfid_parametersList.add(userId_commandParameter);
-
-    CommandParameter userStatus_commandParameter = new CommandParameter("userStatus", int.class);
-    setRfid_parametersList.add(userStatus_commandParameter);
-
-    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
-    setRfid_parametersList.add(userType_commandParameter);
-
-    CommandParameter id_commandParameter = new CommandParameter("id", byte[].class);
-    setRfid_parametersList.add(id_commandParameter);
-
-    setRfid_commandInfo.parameters = setRfid_parametersList;
-    doorLock_clusterInfo.commands.add(setRfid_commandInfo);
-    List<CommandParameter> setUserType_parametersList = new ArrayList<>();
-    CommandInfo setUserType_commandInfo = new CommandInfo();
-    setUserType_commandInfo.name = "setUserType";
-    doorLock_commandInfo.callbackClass = SetUserTypeResponseCallback.class;
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    setUserType_parametersList.add(userId_commandParameter);
-
-    CommandParameter userType_commandParameter = new CommandParameter("userType", int.class);
-    setUserType_parametersList.add(userType_commandParameter);
-
-    setUserType_commandInfo.parameters = setUserType_parametersList;
-    doorLock_clusterInfo.commands.add(setUserType_commandInfo);
-    List<CommandParameter> setWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo setWeekdaySchedule_commandInfo = new CommandInfo();
-    setWeekdaySchedule_commandInfo.name = "setWeekdaySchedule";
-    doorLock_commandInfo.callbackClass = SetWeekdayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    setWeekdaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    setWeekdaySchedule_parametersList.add(userId_commandParameter);
-
-    CommandParameter daysMask_commandParameter = new CommandParameter("daysMask", int.class);
-    setWeekdaySchedule_parametersList.add(daysMask_commandParameter);
-
-    CommandParameter startHour_commandParameter = new CommandParameter("startHour", int.class);
-    setWeekdaySchedule_parametersList.add(startHour_commandParameter);
-
-    CommandParameter startMinute_commandParameter = new CommandParameter("startMinute", int.class);
-    setWeekdaySchedule_parametersList.add(startMinute_commandParameter);
-
-    CommandParameter endHour_commandParameter = new CommandParameter("endHour", int.class);
-    setWeekdaySchedule_parametersList.add(endHour_commandParameter);
-
-    CommandParameter endMinute_commandParameter = new CommandParameter("endMinute", int.class);
-    setWeekdaySchedule_parametersList.add(endMinute_commandParameter);
-
-    setWeekdaySchedule_commandInfo.parameters = setWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(setWeekdaySchedule_commandInfo);
-    List<CommandParameter> setYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo setYeardaySchedule_commandInfo = new CommandInfo();
-    setYeardaySchedule_commandInfo.name = "setYeardaySchedule";
-    doorLock_commandInfo.callbackClass = SetYeardayScheduleResponseCallback.class;
-    CommandParameter scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-    setYeardaySchedule_parametersList.add(scheduleId_commandParameter);
-
-    CommandParameter userId_commandParameter = new CommandParameter("userId", int.class);
-    setYeardaySchedule_parametersList.add(userId_commandParameter);
-
-    CommandParameter localStartTime_commandParameter =
-        new CommandParameter("localStartTime", long.class);
-    setYeardaySchedule_parametersList.add(localStartTime_commandParameter);
-
-    CommandParameter localEndTime_commandParameter =
-        new CommandParameter("localEndTime", long.class);
-    setYeardaySchedule_parametersList.add(localEndTime_commandParameter);
-
-    setYeardaySchedule_commandInfo.parameters = setYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(setYeardaySchedule_commandInfo);
-    List<CommandParameter> unlockDoor_parametersList = new ArrayList<>();
-    CommandInfo unlockDoor_commandInfo = new CommandInfo();
-    unlockDoor_commandInfo.name = "unlockDoor";
-    doorLock_commandInfo.callbackClass = UnlockDoorResponseCallback.class;
-    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
-    unlockDoor_parametersList.add(pin_commandParameter);
-
-    unlockDoor_commandInfo.parameters = unlockDoor_parametersList;
-    doorLock_clusterInfo.commands.add(unlockDoor_commandInfo);
-    List<CommandParameter> unlockWithTimeout_parametersList = new ArrayList<>();
-    CommandInfo unlockWithTimeout_commandInfo = new CommandInfo();
-    unlockWithTimeout_commandInfo.name = "unlockWithTimeout";
-    doorLock_commandInfo.callbackClass = UnlockWithTimeoutResponseCallback.class;
-    CommandParameter timeoutInSeconds_commandParameter =
-        new CommandParameter("timeoutInSeconds", int.class);
-    unlockWithTimeout_parametersList.add(timeoutInSeconds_commandParameter);
-
-    CommandParameter pin_commandParameter = new CommandParameter("pin", byte[].class);
-    unlockWithTimeout_parametersList.add(pin_commandParameter);
-
-    unlockWithTimeout_commandInfo.parameters = unlockWithTimeout_parametersList;
-    doorLock_clusterInfo.commands.add(unlockWithTimeout_commandInfo);
-    clusterInfoMapping.put("doorLock", doorLock_clusterInfo);
-    ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo("electricalMeasurement");
-    clusterInfoMapping.put("electricalMeasurement", electricalMeasurement_clusterInfo);
-    ClusterInfo ethernetNetworkDiagnostics_clusterInfo =
-        new ClusterInfo("ethernetNetworkDiagnostics");
-    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
-    CommandInfo resetCounts_commandInfo = new CommandInfo();
-    resetCounts_commandInfo.name = "resetCounts";
-    ethernetNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
-    resetCounts_commandInfo.parameters = resetCounts_parametersList;
-    ethernetNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
-    clusterInfoMapping.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
-    ClusterInfo fixedLabel_clusterInfo = new ClusterInfo("fixedLabel");
-    clusterInfoMapping.put("fixedLabel", fixedLabel_clusterInfo);
-    ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo("flowMeasurement");
-    clusterInfoMapping.put("flowMeasurement", flowMeasurement_clusterInfo);
-    ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo("generalCommissioning");
-    List<CommandParameter> armFailSafe_parametersList = new ArrayList<>();
-    CommandInfo armFailSafe_commandInfo = new CommandInfo();
-    armFailSafe_commandInfo.name = "armFailSafe";
-    generalCommissioning_commandInfo.callbackClass = ArmFailSafeResponseCallback.class;
-    CommandParameter expiryLengthSeconds_commandParameter =
-        new CommandParameter("expiryLengthSeconds", int.class);
-    armFailSafe_parametersList.add(expiryLengthSeconds_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    armFailSafe_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    armFailSafe_parametersList.add(timeoutMs_commandParameter);
-
-    armFailSafe_commandInfo.parameters = armFailSafe_parametersList;
-    generalCommissioning_clusterInfo.commands.add(armFailSafe_commandInfo);
-    List<CommandParameter> commissioningComplete_parametersList = new ArrayList<>();
-    CommandInfo commissioningComplete_commandInfo = new CommandInfo();
-    commissioningComplete_commandInfo.name = "commissioningComplete";
-    generalCommissioning_commandInfo.callbackClass = CommissioningCompleteResponseCallback.class;
-    commissioningComplete_commandInfo.parameters = commissioningComplete_parametersList;
-    generalCommissioning_clusterInfo.commands.add(commissioningComplete_commandInfo);
-    List<CommandParameter> setRegulatoryConfig_parametersList = new ArrayList<>();
-    CommandInfo setRegulatoryConfig_commandInfo = new CommandInfo();
-    setRegulatoryConfig_commandInfo.name = "setRegulatoryConfig";
-    generalCommissioning_commandInfo.callbackClass = SetRegulatoryConfigResponseCallback.class;
-    CommandParameter location_commandParameter = new CommandParameter("location", int.class);
-    setRegulatoryConfig_parametersList.add(location_commandParameter);
-
-    CommandParameter countryCode_commandParameter =
-        new CommandParameter("countryCode", String.class);
-    setRegulatoryConfig_parametersList.add(countryCode_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    setRegulatoryConfig_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    setRegulatoryConfig_parametersList.add(timeoutMs_commandParameter);
-
-    setRegulatoryConfig_commandInfo.parameters = setRegulatoryConfig_parametersList;
-    generalCommissioning_clusterInfo.commands.add(setRegulatoryConfig_commandInfo);
-    clusterInfoMapping.put("generalCommissioning", generalCommissioning_clusterInfo);
-    ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo("generalDiagnostics");
-    clusterInfoMapping.put("generalDiagnostics", generalDiagnostics_clusterInfo);
-    ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo("groupKeyManagement");
-    clusterInfoMapping.put("groupKeyManagement", groupKeyManagement_clusterInfo);
-    ClusterInfo groups_clusterInfo = new ClusterInfo("groups");
-    List<CommandParameter> addGroup_parametersList = new ArrayList<>();
-    CommandInfo addGroup_commandInfo = new CommandInfo();
-    addGroup_commandInfo.name = "addGroup";
-    groups_commandInfo.callbackClass = AddGroupResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    addGroup_parametersList.add(groupId_commandParameter);
-
-    CommandParameter groupName_commandParameter = new CommandParameter("groupName", String.class);
-    addGroup_parametersList.add(groupName_commandParameter);
-
-    addGroup_commandInfo.parameters = addGroup_parametersList;
-    groups_clusterInfo.commands.add(addGroup_commandInfo);
-    List<CommandParameter> addGroupIfIdentifying_parametersList = new ArrayList<>();
-    CommandInfo addGroupIfIdentifying_commandInfo = new CommandInfo();
-    addGroupIfIdentifying_commandInfo.name = "addGroupIfIdentifying";
-    groups_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    addGroupIfIdentifying_parametersList.add(groupId_commandParameter);
-
-    CommandParameter groupName_commandParameter = new CommandParameter("groupName", String.class);
-    addGroupIfIdentifying_parametersList.add(groupName_commandParameter);
-
-    addGroupIfIdentifying_commandInfo.parameters = addGroupIfIdentifying_parametersList;
-    groups_clusterInfo.commands.add(addGroupIfIdentifying_commandInfo);
-    List<CommandParameter> getGroupMembership_parametersList = new ArrayList<>();
-    CommandInfo getGroupMembership_commandInfo = new CommandInfo();
-    getGroupMembership_commandInfo.name = "getGroupMembership";
-    groups_commandInfo.callbackClass = GetGroupMembershipResponseCallback.class;
-    CommandParameter groupCount_commandParameter = new CommandParameter("groupCount", int.class);
-    getGroupMembership_parametersList.add(groupCount_commandParameter);
-
-    CommandParameter groupList_commandParameter = new CommandParameter("groupList", int.class);
-    getGroupMembership_parametersList.add(groupList_commandParameter);
-
-    getGroupMembership_commandInfo.parameters = getGroupMembership_parametersList;
-    groups_clusterInfo.commands.add(getGroupMembership_commandInfo);
-    List<CommandParameter> removeAllGroups_parametersList = new ArrayList<>();
-    CommandInfo removeAllGroups_commandInfo = new CommandInfo();
-    removeAllGroups_commandInfo.name = "removeAllGroups";
-    groups_commandInfo.callbackClass = DefaultClusterCallback.class;
-    removeAllGroups_commandInfo.parameters = removeAllGroups_parametersList;
-    groups_clusterInfo.commands.add(removeAllGroups_commandInfo);
-    List<CommandParameter> removeGroup_parametersList = new ArrayList<>();
-    CommandInfo removeGroup_commandInfo = new CommandInfo();
-    removeGroup_commandInfo.name = "removeGroup";
-    groups_commandInfo.callbackClass = RemoveGroupResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    removeGroup_parametersList.add(groupId_commandParameter);
-
-    removeGroup_commandInfo.parameters = removeGroup_parametersList;
-    groups_clusterInfo.commands.add(removeGroup_commandInfo);
-    List<CommandParameter> viewGroup_parametersList = new ArrayList<>();
-    CommandInfo viewGroup_commandInfo = new CommandInfo();
-    viewGroup_commandInfo.name = "viewGroup";
-    groups_commandInfo.callbackClass = ViewGroupResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    viewGroup_parametersList.add(groupId_commandParameter);
-
-    viewGroup_commandInfo.parameters = viewGroup_parametersList;
-    groups_clusterInfo.commands.add(viewGroup_commandInfo);
-    clusterInfoMapping.put("groups", groups_clusterInfo);
-    ClusterInfo identify_clusterInfo = new ClusterInfo("identify");
-    List<CommandParameter> identify_parametersList = new ArrayList<>();
-    CommandInfo identify_commandInfo = new CommandInfo();
-    identify_commandInfo.name = "identify";
-    identify_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter identifyTime_commandParameter =
-        new CommandParameter("identifyTime", int.class);
-    identify_parametersList.add(identifyTime_commandParameter);
-
-    identify_commandInfo.parameters = identify_parametersList;
-    identify_clusterInfo.commands.add(identify_commandInfo);
-    List<CommandParameter> identifyQuery_parametersList = new ArrayList<>();
-    CommandInfo identifyQuery_commandInfo = new CommandInfo();
-    identifyQuery_commandInfo.name = "identifyQuery";
-    identify_commandInfo.callbackClass = IdentifyQueryResponseCallback.class;
-    identifyQuery_commandInfo.parameters = identifyQuery_parametersList;
-    identify_clusterInfo.commands.add(identifyQuery_commandInfo);
-    List<CommandParameter> triggerEffect_parametersList = new ArrayList<>();
-    CommandInfo triggerEffect_commandInfo = new CommandInfo();
-    triggerEffect_commandInfo.name = "triggerEffect";
-    identify_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter effectIdentifier_commandParameter =
-        new CommandParameter("effectIdentifier", int.class);
-    triggerEffect_parametersList.add(effectIdentifier_commandParameter);
-
-    CommandParameter effectVariant_commandParameter =
-        new CommandParameter("effectVariant", int.class);
-    triggerEffect_parametersList.add(effectVariant_commandParameter);
-
-    triggerEffect_commandInfo.parameters = triggerEffect_parametersList;
-    identify_clusterInfo.commands.add(triggerEffect_commandInfo);
-    clusterInfoMapping.put("identify", identify_clusterInfo);
-    ClusterInfo keypadInput_clusterInfo = new ClusterInfo("keypadInput");
-    List<CommandParameter> sendKey_parametersList = new ArrayList<>();
-    CommandInfo sendKey_commandInfo = new CommandInfo();
-    sendKey_commandInfo.name = "sendKey";
-    keypadInput_commandInfo.callbackClass = SendKeyResponseCallback.class;
-    CommandParameter keyCode_commandParameter = new CommandParameter("keyCode", int.class);
-    sendKey_parametersList.add(keyCode_commandParameter);
-
-    sendKey_commandInfo.parameters = sendKey_parametersList;
-    keypadInput_clusterInfo.commands.add(sendKey_commandInfo);
-    clusterInfoMapping.put("keypadInput", keypadInput_clusterInfo);
-    ClusterInfo levelControl_clusterInfo = new ClusterInfo("levelControl");
-    List<CommandParameter> move_parametersList = new ArrayList<>();
-    CommandInfo move_commandInfo = new CommandInfo();
-    move_commandInfo.name = "move";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    move_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    move_parametersList.add(rate_commandParameter);
-
-    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-    move_parametersList.add(optionMask_commandParameter);
-
-    CommandParameter optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    move_parametersList.add(optionOverride_commandParameter);
-
-    move_commandInfo.parameters = move_parametersList;
-    levelControl_clusterInfo.commands.add(move_commandInfo);
-    List<CommandParameter> moveToLevel_parametersList = new ArrayList<>();
-    CommandInfo moveToLevel_commandInfo = new CommandInfo();
-    moveToLevel_commandInfo.name = "moveToLevel";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter level_commandParameter = new CommandParameter("level", int.class);
-    moveToLevel_parametersList.add(level_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToLevel_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-    moveToLevel_parametersList.add(optionMask_commandParameter);
-
-    CommandParameter optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    moveToLevel_parametersList.add(optionOverride_commandParameter);
-
-    moveToLevel_commandInfo.parameters = moveToLevel_parametersList;
-    levelControl_clusterInfo.commands.add(moveToLevel_commandInfo);
-    List<CommandParameter> moveToLevelWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo moveToLevelWithOnOff_commandInfo = new CommandInfo();
-    moveToLevelWithOnOff_commandInfo.name = "moveToLevelWithOnOff";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter level_commandParameter = new CommandParameter("level", int.class);
-    moveToLevelWithOnOff_parametersList.add(level_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    moveToLevelWithOnOff_parametersList.add(transitionTime_commandParameter);
-
-    moveToLevelWithOnOff_commandInfo.parameters = moveToLevelWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(moveToLevelWithOnOff_commandInfo);
-    List<CommandParameter> moveWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo moveWithOnOff_commandInfo = new CommandInfo();
-    moveWithOnOff_commandInfo.name = "moveWithOnOff";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    moveWithOnOff_parametersList.add(moveMode_commandParameter);
-
-    CommandParameter rate_commandParameter = new CommandParameter("rate", int.class);
-    moveWithOnOff_parametersList.add(rate_commandParameter);
-
-    moveWithOnOff_commandInfo.parameters = moveWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(moveWithOnOff_commandInfo);
-    List<CommandParameter> step_parametersList = new ArrayList<>();
-    CommandInfo step_commandInfo = new CommandInfo();
-    step_commandInfo.name = "step";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    step_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    step_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    step_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-    step_parametersList.add(optionMask_commandParameter);
-
-    CommandParameter optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    step_parametersList.add(optionOverride_commandParameter);
-
-    step_commandInfo.parameters = step_parametersList;
-    levelControl_clusterInfo.commands.add(step_commandInfo);
-    List<CommandParameter> stepWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo stepWithOnOff_commandInfo = new CommandInfo();
-    stepWithOnOff_commandInfo.name = "stepWithOnOff";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    stepWithOnOff_parametersList.add(stepMode_commandParameter);
-
-    CommandParameter stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    stepWithOnOff_parametersList.add(stepSize_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    stepWithOnOff_parametersList.add(transitionTime_commandParameter);
-
-    stepWithOnOff_commandInfo.parameters = stepWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(stepWithOnOff_commandInfo);
-    List<CommandParameter> stop_parametersList = new ArrayList<>();
-    CommandInfo stop_commandInfo = new CommandInfo();
-    stop_commandInfo.name = "stop";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-    stop_parametersList.add(optionMask_commandParameter);
-
-    CommandParameter optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    stop_parametersList.add(optionOverride_commandParameter);
-
-    stop_commandInfo.parameters = stop_parametersList;
-    levelControl_clusterInfo.commands.add(stop_commandInfo);
-    List<CommandParameter> stopWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo stopWithOnOff_commandInfo = new CommandInfo();
-    stopWithOnOff_commandInfo.name = "stopWithOnOff";
-    levelControl_commandInfo.callbackClass = DefaultClusterCallback.class;
-    stopWithOnOff_commandInfo.parameters = stopWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(stopWithOnOff_commandInfo);
-    clusterInfoMapping.put("levelControl", levelControl_clusterInfo);
-    ClusterInfo lowPower_clusterInfo = new ClusterInfo("lowPower");
-    List<CommandParameter> sleep_parametersList = new ArrayList<>();
-    CommandInfo sleep_commandInfo = new CommandInfo();
-    sleep_commandInfo.name = "sleep";
-    lowPower_commandInfo.callbackClass = DefaultClusterCallback.class;
-    sleep_commandInfo.parameters = sleep_parametersList;
-    lowPower_clusterInfo.commands.add(sleep_commandInfo);
-    clusterInfoMapping.put("lowPower", lowPower_clusterInfo);
-    ClusterInfo mediaInput_clusterInfo = new ClusterInfo("mediaInput");
-    List<CommandParameter> hideInputStatus_parametersList = new ArrayList<>();
-    CommandInfo hideInputStatus_commandInfo = new CommandInfo();
-    hideInputStatus_commandInfo.name = "hideInputStatus";
-    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    hideInputStatus_commandInfo.parameters = hideInputStatus_parametersList;
-    mediaInput_clusterInfo.commands.add(hideInputStatus_commandInfo);
-    List<CommandParameter> renameInput_parametersList = new ArrayList<>();
-    CommandInfo renameInput_commandInfo = new CommandInfo();
-    renameInput_commandInfo.name = "renameInput";
-    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
-    renameInput_parametersList.add(index_commandParameter);
-
-    CommandParameter name_commandParameter = new CommandParameter("name", String.class);
-    renameInput_parametersList.add(name_commandParameter);
-
-    renameInput_commandInfo.parameters = renameInput_parametersList;
-    mediaInput_clusterInfo.commands.add(renameInput_commandInfo);
-    List<CommandParameter> selectInput_parametersList = new ArrayList<>();
-    CommandInfo selectInput_commandInfo = new CommandInfo();
-    selectInput_commandInfo.name = "selectInput";
-    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter index_commandParameter = new CommandParameter("index", int.class);
-    selectInput_parametersList.add(index_commandParameter);
-
-    selectInput_commandInfo.parameters = selectInput_parametersList;
-    mediaInput_clusterInfo.commands.add(selectInput_commandInfo);
-    List<CommandParameter> showInputStatus_parametersList = new ArrayList<>();
-    CommandInfo showInputStatus_commandInfo = new CommandInfo();
-    showInputStatus_commandInfo.name = "showInputStatus";
-    mediaInput_commandInfo.callbackClass = DefaultClusterCallback.class;
-    showInputStatus_commandInfo.parameters = showInputStatus_parametersList;
-    mediaInput_clusterInfo.commands.add(showInputStatus_commandInfo);
-    clusterInfoMapping.put("mediaInput", mediaInput_clusterInfo);
-    ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo("mediaPlayback");
-    List<CommandParameter> mediaFastForward_parametersList = new ArrayList<>();
-    CommandInfo mediaFastForward_commandInfo = new CommandInfo();
-    mediaFastForward_commandInfo.name = "mediaFastForward";
-    mediaPlayback_commandInfo.callbackClass = MediaFastForwardResponseCallback.class;
-    mediaFastForward_commandInfo.parameters = mediaFastForward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaFastForward_commandInfo);
-    List<CommandParameter> mediaNext_parametersList = new ArrayList<>();
-    CommandInfo mediaNext_commandInfo = new CommandInfo();
-    mediaNext_commandInfo.name = "mediaNext";
-    mediaPlayback_commandInfo.callbackClass = MediaNextResponseCallback.class;
-    mediaNext_commandInfo.parameters = mediaNext_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaNext_commandInfo);
-    List<CommandParameter> mediaPause_parametersList = new ArrayList<>();
-    CommandInfo mediaPause_commandInfo = new CommandInfo();
-    mediaPause_commandInfo.name = "mediaPause";
-    mediaPlayback_commandInfo.callbackClass = MediaPauseResponseCallback.class;
-    mediaPause_commandInfo.parameters = mediaPause_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPause_commandInfo);
-    List<CommandParameter> mediaPlay_parametersList = new ArrayList<>();
-    CommandInfo mediaPlay_commandInfo = new CommandInfo();
-    mediaPlay_commandInfo.name = "mediaPlay";
-    mediaPlayback_commandInfo.callbackClass = MediaPlayResponseCallback.class;
-    mediaPlay_commandInfo.parameters = mediaPlay_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlay_commandInfo);
-    List<CommandParameter> mediaPrevious_parametersList = new ArrayList<>();
-    CommandInfo mediaPrevious_commandInfo = new CommandInfo();
-    mediaPrevious_commandInfo.name = "mediaPrevious";
-    mediaPlayback_commandInfo.callbackClass = MediaPreviousResponseCallback.class;
-    mediaPrevious_commandInfo.parameters = mediaPrevious_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPrevious_commandInfo);
-    List<CommandParameter> mediaRewind_parametersList = new ArrayList<>();
-    CommandInfo mediaRewind_commandInfo = new CommandInfo();
-    mediaRewind_commandInfo.name = "mediaRewind";
-    mediaPlayback_commandInfo.callbackClass = MediaRewindResponseCallback.class;
-    mediaRewind_commandInfo.parameters = mediaRewind_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaRewind_commandInfo);
-    List<CommandParameter> mediaSeek_parametersList = new ArrayList<>();
-    CommandInfo mediaSeek_commandInfo = new CommandInfo();
-    mediaSeek_commandInfo.name = "mediaSeek";
-    mediaPlayback_commandInfo.callbackClass = MediaSeekResponseCallback.class;
-    CommandParameter position_commandParameter = new CommandParameter("position", long.class);
-    mediaSeek_parametersList.add(position_commandParameter);
-
-    mediaSeek_commandInfo.parameters = mediaSeek_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaSeek_commandInfo);
-    List<CommandParameter> mediaSkipBackward_parametersList = new ArrayList<>();
-    CommandInfo mediaSkipBackward_commandInfo = new CommandInfo();
-    mediaSkipBackward_commandInfo.name = "mediaSkipBackward";
-    mediaPlayback_commandInfo.callbackClass = MediaSkipBackwardResponseCallback.class;
-    CommandParameter deltaPositionMilliseconds_commandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaSkipBackward_parametersList.add(deltaPositionMilliseconds_commandParameter);
-
-    mediaSkipBackward_commandInfo.parameters = mediaSkipBackward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaSkipBackward_commandInfo);
-    List<CommandParameter> mediaSkipForward_parametersList = new ArrayList<>();
-    CommandInfo mediaSkipForward_commandInfo = new CommandInfo();
-    mediaSkipForward_commandInfo.name = "mediaSkipForward";
-    mediaPlayback_commandInfo.callbackClass = MediaSkipForwardResponseCallback.class;
-    CommandParameter deltaPositionMilliseconds_commandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaSkipForward_parametersList.add(deltaPositionMilliseconds_commandParameter);
-
-    mediaSkipForward_commandInfo.parameters = mediaSkipForward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaSkipForward_commandInfo);
-    List<CommandParameter> mediaStartOver_parametersList = new ArrayList<>();
-    CommandInfo mediaStartOver_commandInfo = new CommandInfo();
-    mediaStartOver_commandInfo.name = "mediaStartOver";
-    mediaPlayback_commandInfo.callbackClass = MediaStartOverResponseCallback.class;
-    mediaStartOver_commandInfo.parameters = mediaStartOver_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaStartOver_commandInfo);
-    List<CommandParameter> mediaStop_parametersList = new ArrayList<>();
-    CommandInfo mediaStop_commandInfo = new CommandInfo();
-    mediaStop_commandInfo.name = "mediaStop";
-    mediaPlayback_commandInfo.callbackClass = MediaStopResponseCallback.class;
-    mediaStop_commandInfo.parameters = mediaStop_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaStop_commandInfo);
-    clusterInfoMapping.put("mediaPlayback", mediaPlayback_clusterInfo);
-    ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo("networkCommissioning");
-    List<CommandParameter> addThreadNetwork_parametersList = new ArrayList<>();
-    CommandInfo addThreadNetwork_commandInfo = new CommandInfo();
-    addThreadNetwork_commandInfo.name = "addThreadNetwork";
-    networkCommissioning_commandInfo.callbackClass = AddThreadNetworkResponseCallback.class;
-    CommandParameter operationalDataset_commandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
-    addThreadNetwork_parametersList.add(operationalDataset_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    addThreadNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    addThreadNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    addThreadNetwork_commandInfo.parameters = addThreadNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(addThreadNetwork_commandInfo);
-    List<CommandParameter> addWiFiNetwork_parametersList = new ArrayList<>();
-    CommandInfo addWiFiNetwork_commandInfo = new CommandInfo();
-    addWiFiNetwork_commandInfo.name = "addWiFiNetwork";
-    networkCommissioning_commandInfo.callbackClass = AddWiFiNetworkResponseCallback.class;
-    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-    addWiFiNetwork_parametersList.add(ssid_commandParameter);
-
-    CommandParameter credentials_commandParameter =
-        new CommandParameter("credentials", byte[].class);
-    addWiFiNetwork_parametersList.add(credentials_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    addWiFiNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    addWiFiNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    addWiFiNetwork_commandInfo.parameters = addWiFiNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(addWiFiNetwork_commandInfo);
-    List<CommandParameter> disableNetwork_parametersList = new ArrayList<>();
-    CommandInfo disableNetwork_commandInfo = new CommandInfo();
-    disableNetwork_commandInfo.name = "disableNetwork";
-    networkCommissioning_commandInfo.callbackClass = DisableNetworkResponseCallback.class;
-    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-    disableNetwork_parametersList.add(networkID_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    disableNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    disableNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    disableNetwork_commandInfo.parameters = disableNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(disableNetwork_commandInfo);
-    List<CommandParameter> enableNetwork_parametersList = new ArrayList<>();
-    CommandInfo enableNetwork_commandInfo = new CommandInfo();
-    enableNetwork_commandInfo.name = "enableNetwork";
-    networkCommissioning_commandInfo.callbackClass = EnableNetworkResponseCallback.class;
-    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-    enableNetwork_parametersList.add(networkID_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    enableNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    enableNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    enableNetwork_commandInfo.parameters = enableNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(enableNetwork_commandInfo);
-    List<CommandParameter> getLastNetworkCommissioningResult_parametersList = new ArrayList<>();
-    CommandInfo getLastNetworkCommissioningResult_commandInfo = new CommandInfo();
-    getLastNetworkCommissioningResult_commandInfo.name = "getLastNetworkCommissioningResult";
-    networkCommissioning_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    getLastNetworkCommissioningResult_parametersList.add(timeoutMs_commandParameter);
-
-    getLastNetworkCommissioningResult_commandInfo.parameters =
-        getLastNetworkCommissioningResult_parametersList;
-    networkCommissioning_clusterInfo.commands.add(getLastNetworkCommissioningResult_commandInfo);
-    List<CommandParameter> removeNetwork_parametersList = new ArrayList<>();
-    CommandInfo removeNetwork_commandInfo = new CommandInfo();
-    removeNetwork_commandInfo.name = "removeNetwork";
-    networkCommissioning_commandInfo.callbackClass = RemoveNetworkResponseCallback.class;
-    CommandParameter networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-    removeNetwork_parametersList.add(networkID_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    removeNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    removeNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    removeNetwork_commandInfo.parameters = removeNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(removeNetwork_commandInfo);
-    List<CommandParameter> scanNetworks_parametersList = new ArrayList<>();
-    CommandInfo scanNetworks_commandInfo = new CommandInfo();
-    scanNetworks_commandInfo.name = "scanNetworks";
-    networkCommissioning_commandInfo.callbackClass = ScanNetworksResponseCallback.class;
-    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-    scanNetworks_parametersList.add(ssid_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    scanNetworks_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    scanNetworks_parametersList.add(timeoutMs_commandParameter);
-
-    scanNetworks_commandInfo.parameters = scanNetworks_parametersList;
-    networkCommissioning_clusterInfo.commands.add(scanNetworks_commandInfo);
-    List<CommandParameter> updateThreadNetwork_parametersList = new ArrayList<>();
-    CommandInfo updateThreadNetwork_commandInfo = new CommandInfo();
-    updateThreadNetwork_commandInfo.name = "updateThreadNetwork";
-    networkCommissioning_commandInfo.callbackClass = UpdateThreadNetworkResponseCallback.class;
-    CommandParameter operationalDataset_commandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
-    updateThreadNetwork_parametersList.add(operationalDataset_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    updateThreadNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    updateThreadNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    updateThreadNetwork_commandInfo.parameters = updateThreadNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(updateThreadNetwork_commandInfo);
-    List<CommandParameter> updateWiFiNetwork_parametersList = new ArrayList<>();
-    CommandInfo updateWiFiNetwork_commandInfo = new CommandInfo();
-    updateWiFiNetwork_commandInfo.name = "updateWiFiNetwork";
-    networkCommissioning_commandInfo.callbackClass = UpdateWiFiNetworkResponseCallback.class;
-    CommandParameter ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-    updateWiFiNetwork_parametersList.add(ssid_commandParameter);
-
-    CommandParameter credentials_commandParameter =
-        new CommandParameter("credentials", byte[].class);
-    updateWiFiNetwork_parametersList.add(credentials_commandParameter);
-
-    CommandParameter breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-    updateWiFiNetwork_parametersList.add(breadcrumb_commandParameter);
-
-    CommandParameter timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-    updateWiFiNetwork_parametersList.add(timeoutMs_commandParameter);
-
-    updateWiFiNetwork_commandInfo.parameters = updateWiFiNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(updateWiFiNetwork_commandInfo);
-    clusterInfoMapping.put("networkCommissioning", networkCommissioning_clusterInfo);
-    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
-        new ClusterInfo("otaSoftwareUpdateProvider");
-    List<CommandParameter> applyUpdateRequest_parametersList = new ArrayList<>();
-    CommandInfo applyUpdateRequest_commandInfo = new CommandInfo();
-    applyUpdateRequest_commandInfo.name = "applyUpdateRequest";
-    otaSoftwareUpdateProvider_commandInfo.callbackClass = ApplyUpdateRequestResponseCallback.class;
-    CommandParameter updateToken_commandParameter =
-        new CommandParameter("updateToken", byte[].class);
-    applyUpdateRequest_parametersList.add(updateToken_commandParameter);
-
-    CommandParameter newVersion_commandParameter = new CommandParameter("newVersion", long.class);
-    applyUpdateRequest_parametersList.add(newVersion_commandParameter);
-
-    applyUpdateRequest_commandInfo.parameters = applyUpdateRequest_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(applyUpdateRequest_commandInfo);
-    List<CommandParameter> notifyUpdateApplied_parametersList = new ArrayList<>();
-    CommandInfo notifyUpdateApplied_commandInfo = new CommandInfo();
-    notifyUpdateApplied_commandInfo.name = "notifyUpdateApplied";
-    otaSoftwareUpdateProvider_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter updateToken_commandParameter =
-        new CommandParameter("updateToken", byte[].class);
-    notifyUpdateApplied_parametersList.add(updateToken_commandParameter);
-
-    CommandParameter softwareVersion_commandParameter =
-        new CommandParameter("softwareVersion", long.class);
-    notifyUpdateApplied_parametersList.add(softwareVersion_commandParameter);
-
-    notifyUpdateApplied_commandInfo.parameters = notifyUpdateApplied_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(notifyUpdateApplied_commandInfo);
-    List<CommandParameter> queryImage_parametersList = new ArrayList<>();
-    CommandInfo queryImage_commandInfo = new CommandInfo();
-    queryImage_commandInfo.name = "queryImage";
-    otaSoftwareUpdateProvider_commandInfo.callbackClass = QueryImageResponseCallback.class;
-    CommandParameter vendorId_commandParameter = new CommandParameter("vendorId", int.class);
-    queryImage_parametersList.add(vendorId_commandParameter);
-
-    CommandParameter productId_commandParameter = new CommandParameter("productId", int.class);
-    queryImage_parametersList.add(productId_commandParameter);
-
-    CommandParameter hardwareVersion_commandParameter =
-        new CommandParameter("hardwareVersion", int.class);
-    queryImage_parametersList.add(hardwareVersion_commandParameter);
-
-    CommandParameter softwareVersion_commandParameter =
-        new CommandParameter("softwareVersion", long.class);
-    queryImage_parametersList.add(softwareVersion_commandParameter);
-
-    CommandParameter protocolsSupported_commandParameter =
-        new CommandParameter("protocolsSupported", int.class);
-    queryImage_parametersList.add(protocolsSupported_commandParameter);
-
-    CommandParameter location_commandParameter = new CommandParameter("location", String.class);
-    queryImage_parametersList.add(location_commandParameter);
-
-    CommandParameter requestorCanConsent_commandParameter =
-        new CommandParameter("requestorCanConsent", boolean.class);
-    queryImage_parametersList.add(requestorCanConsent_commandParameter);
-
-    CommandParameter metadataForProvider_commandParameter =
-        new CommandParameter("metadataForProvider", byte[].class);
-    queryImage_parametersList.add(metadataForProvider_commandParameter);
-
-    queryImage_commandInfo.parameters = queryImage_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(queryImage_commandInfo);
-    clusterInfoMapping.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
-    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
-        new ClusterInfo("otaSoftwareUpdateRequestor");
-    List<CommandParameter> announceOtaProvider_parametersList = new ArrayList<>();
-    CommandInfo announceOtaProvider_commandInfo = new CommandInfo();
-    announceOtaProvider_commandInfo.name = "announceOtaProvider";
-    otaSoftwareUpdateRequestor_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter providerLocation_commandParameter =
-        new CommandParameter("providerLocation", byte[].class);
-    announceOtaProvider_parametersList.add(providerLocation_commandParameter);
-
-    CommandParameter vendorId_commandParameter = new CommandParameter("vendorId", int.class);
-    announceOtaProvider_parametersList.add(vendorId_commandParameter);
-
-    CommandParameter announcementReason_commandParameter =
-        new CommandParameter("announcementReason", int.class);
-    announceOtaProvider_parametersList.add(announcementReason_commandParameter);
-
-    CommandParameter metadataForNode_commandParameter =
-        new CommandParameter("metadataForNode", byte[].class);
-    announceOtaProvider_parametersList.add(metadataForNode_commandParameter);
-
-    announceOtaProvider_commandInfo.parameters = announceOtaProvider_parametersList;
-    otaSoftwareUpdateRequestor_clusterInfo.commands.add(announceOtaProvider_commandInfo);
-    clusterInfoMapping.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
-    ClusterInfo occupancySensing_clusterInfo = new ClusterInfo("occupancySensing");
-    clusterInfoMapping.put("occupancySensing", occupancySensing_clusterInfo);
-    ClusterInfo onOff_clusterInfo = new ClusterInfo("onOff");
-    List<CommandParameter> off_parametersList = new ArrayList<>();
-    CommandInfo off_commandInfo = new CommandInfo();
-    off_commandInfo.name = "off";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    off_commandInfo.parameters = off_parametersList;
-    onOff_clusterInfo.commands.add(off_commandInfo);
-    List<CommandParameter> offWithEffect_parametersList = new ArrayList<>();
-    CommandInfo offWithEffect_commandInfo = new CommandInfo();
-    offWithEffect_commandInfo.name = "offWithEffect";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter effectId_commandParameter = new CommandParameter("effectId", int.class);
-    offWithEffect_parametersList.add(effectId_commandParameter);
-
-    CommandParameter effectVariant_commandParameter =
-        new CommandParameter("effectVariant", int.class);
-    offWithEffect_parametersList.add(effectVariant_commandParameter);
-
-    offWithEffect_commandInfo.parameters = offWithEffect_parametersList;
-    onOff_clusterInfo.commands.add(offWithEffect_commandInfo);
-    List<CommandParameter> on_parametersList = new ArrayList<>();
-    CommandInfo on_commandInfo = new CommandInfo();
-    on_commandInfo.name = "on";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    on_commandInfo.parameters = on_parametersList;
-    onOff_clusterInfo.commands.add(on_commandInfo);
-    List<CommandParameter> onWithRecallGlobalScene_parametersList = new ArrayList<>();
-    CommandInfo onWithRecallGlobalScene_commandInfo = new CommandInfo();
-    onWithRecallGlobalScene_commandInfo.name = "onWithRecallGlobalScene";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    onWithRecallGlobalScene_commandInfo.parameters = onWithRecallGlobalScene_parametersList;
-    onOff_clusterInfo.commands.add(onWithRecallGlobalScene_commandInfo);
-    List<CommandParameter> onWithTimedOff_parametersList = new ArrayList<>();
-    CommandInfo onWithTimedOff_commandInfo = new CommandInfo();
-    onWithTimedOff_commandInfo.name = "onWithTimedOff";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter onOffControl_commandParameter =
-        new CommandParameter("onOffControl", int.class);
-    onWithTimedOff_parametersList.add(onOffControl_commandParameter);
-
-    CommandParameter onTime_commandParameter = new CommandParameter("onTime", int.class);
-    onWithTimedOff_parametersList.add(onTime_commandParameter);
-
-    CommandParameter offWaitTime_commandParameter = new CommandParameter("offWaitTime", int.class);
-    onWithTimedOff_parametersList.add(offWaitTime_commandParameter);
-
-    onWithTimedOff_commandInfo.parameters = onWithTimedOff_parametersList;
-    onOff_clusterInfo.commands.add(onWithTimedOff_commandInfo);
-    List<CommandParameter> toggle_parametersList = new ArrayList<>();
-    CommandInfo toggle_commandInfo = new CommandInfo();
-    toggle_commandInfo.name = "toggle";
-    onOff_commandInfo.callbackClass = DefaultClusterCallback.class;
-    toggle_commandInfo.parameters = toggle_parametersList;
-    onOff_clusterInfo.commands.add(toggle_commandInfo);
-    clusterInfoMapping.put("onOff", onOff_clusterInfo);
-    ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo("onOffSwitchConfiguration");
-    clusterInfoMapping.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
-    ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo("operationalCredentials");
-    List<CommandParameter> addNOC_parametersList = new ArrayList<>();
-    CommandInfo addNOC_commandInfo = new CommandInfo();
-    addNOC_commandInfo.name = "addNOC";
-    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
-    CommandParameter NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
-    addNOC_parametersList.add(NOCValue_commandParameter);
-
-    CommandParameter ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
-    addNOC_parametersList.add(ICACValue_commandParameter);
-
-    CommandParameter IPKValue_commandParameter = new CommandParameter("IPKValue", byte[].class);
-    addNOC_parametersList.add(IPKValue_commandParameter);
-
-    CommandParameter caseAdminNode_commandParameter =
-        new CommandParameter("caseAdminNode", long.class);
-    addNOC_parametersList.add(caseAdminNode_commandParameter);
-
-    CommandParameter adminVendorId_commandParameter =
-        new CommandParameter("adminVendorId", int.class);
-    addNOC_parametersList.add(adminVendorId_commandParameter);
-
-    addNOC_commandInfo.parameters = addNOC_parametersList;
-    operationalCredentials_clusterInfo.commands.add(addNOC_commandInfo);
-    List<CommandParameter> addTrustedRootCertificate_parametersList = new ArrayList<>();
-    CommandInfo addTrustedRootCertificate_commandInfo = new CommandInfo();
-    addTrustedRootCertificate_commandInfo.name = "addTrustedRootCertificate";
-    operationalCredentials_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter rootCertificate_commandParameter =
-        new CommandParameter("rootCertificate", byte[].class);
-    addTrustedRootCertificate_parametersList.add(rootCertificate_commandParameter);
-
-    addTrustedRootCertificate_commandInfo.parameters = addTrustedRootCertificate_parametersList;
-    operationalCredentials_clusterInfo.commands.add(addTrustedRootCertificate_commandInfo);
-    List<CommandParameter> attestationRequest_parametersList = new ArrayList<>();
-    CommandInfo attestationRequest_commandInfo = new CommandInfo();
-    attestationRequest_commandInfo.name = "attestationRequest";
-    operationalCredentials_commandInfo.callbackClass = AttestationResponseCallback.class;
-    CommandParameter attestationNonce_commandParameter =
-        new CommandParameter("attestationNonce", byte[].class);
-    attestationRequest_parametersList.add(attestationNonce_commandParameter);
-
-    attestationRequest_commandInfo.parameters = attestationRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(attestationRequest_commandInfo);
-    List<CommandParameter> certificateChainRequest_parametersList = new ArrayList<>();
-    CommandInfo certificateChainRequest_commandInfo = new CommandInfo();
-    certificateChainRequest_commandInfo.name = "certificateChainRequest";
-    operationalCredentials_commandInfo.callbackClass = CertificateChainResponseCallback.class;
-    CommandParameter certificateType_commandParameter =
-        new CommandParameter("certificateType", int.class);
-    certificateChainRequest_parametersList.add(certificateType_commandParameter);
-
-    certificateChainRequest_commandInfo.parameters = certificateChainRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(certificateChainRequest_commandInfo);
-    List<CommandParameter> opCSRRequest_parametersList = new ArrayList<>();
-    CommandInfo opCSRRequest_commandInfo = new CommandInfo();
-    opCSRRequest_commandInfo.name = "opCSRRequest";
-    operationalCredentials_commandInfo.callbackClass = OpCSRResponseCallback.class;
-    CommandParameter CSRNonce_commandParameter = new CommandParameter("CSRNonce", byte[].class);
-    opCSRRequest_parametersList.add(CSRNonce_commandParameter);
-
-    opCSRRequest_commandInfo.parameters = opCSRRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(opCSRRequest_commandInfo);
-    List<CommandParameter> removeFabric_parametersList = new ArrayList<>();
-    CommandInfo removeFabric_commandInfo = new CommandInfo();
-    removeFabric_commandInfo.name = "removeFabric";
-    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
-    CommandParameter fabricIndex_commandParameter = new CommandParameter("fabricIndex", int.class);
-    removeFabric_parametersList.add(fabricIndex_commandParameter);
-
-    removeFabric_commandInfo.parameters = removeFabric_parametersList;
-    operationalCredentials_clusterInfo.commands.add(removeFabric_commandInfo);
-    List<CommandParameter> removeTrustedRootCertificate_parametersList = new ArrayList<>();
-    CommandInfo removeTrustedRootCertificate_commandInfo = new CommandInfo();
-    removeTrustedRootCertificate_commandInfo.name = "removeTrustedRootCertificate";
-    operationalCredentials_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter trustedRootIdentifier_commandParameter =
-        new CommandParameter("trustedRootIdentifier", byte[].class);
-    removeTrustedRootCertificate_parametersList.add(trustedRootIdentifier_commandParameter);
-
-    removeTrustedRootCertificate_commandInfo.parameters =
-        removeTrustedRootCertificate_parametersList;
-    operationalCredentials_clusterInfo.commands.add(removeTrustedRootCertificate_commandInfo);
-    List<CommandParameter> updateFabricLabel_parametersList = new ArrayList<>();
-    CommandInfo updateFabricLabel_commandInfo = new CommandInfo();
-    updateFabricLabel_commandInfo.name = "updateFabricLabel";
-    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
-    CommandParameter label_commandParameter = new CommandParameter("label", String.class);
-    updateFabricLabel_parametersList.add(label_commandParameter);
-
-    updateFabricLabel_commandInfo.parameters = updateFabricLabel_parametersList;
-    operationalCredentials_clusterInfo.commands.add(updateFabricLabel_commandInfo);
-    List<CommandParameter> updateNOC_parametersList = new ArrayList<>();
-    CommandInfo updateNOC_commandInfo = new CommandInfo();
-    updateNOC_commandInfo.name = "updateNOC";
-    operationalCredentials_commandInfo.callbackClass = NOCResponseCallback.class;
-    CommandParameter NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
-    updateNOC_parametersList.add(NOCValue_commandParameter);
-
-    CommandParameter ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
-    updateNOC_parametersList.add(ICACValue_commandParameter);
-
-    updateNOC_commandInfo.parameters = updateNOC_parametersList;
-    operationalCredentials_clusterInfo.commands.add(updateNOC_commandInfo);
-    clusterInfoMapping.put("operationalCredentials", operationalCredentials_clusterInfo);
-    ClusterInfo powerSource_clusterInfo = new ClusterInfo("powerSource");
-    clusterInfoMapping.put("powerSource", powerSource_clusterInfo);
-    ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo("pressureMeasurement");
-    clusterInfoMapping.put("pressureMeasurement", pressureMeasurement_clusterInfo);
-    ClusterInfo pumpConfigurationAndControl_clusterInfo =
-        new ClusterInfo("pumpConfigurationAndControl");
-    clusterInfoMapping.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
-    ClusterInfo relativeHumidityMeasurement_clusterInfo =
-        new ClusterInfo("relativeHumidityMeasurement");
-    clusterInfoMapping.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
-    ClusterInfo scenes_clusterInfo = new ClusterInfo("scenes");
-    List<CommandParameter> addScene_parametersList = new ArrayList<>();
-    CommandInfo addScene_commandInfo = new CommandInfo();
-    addScene_commandInfo.name = "addScene";
-    scenes_commandInfo.callbackClass = AddSceneResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    addScene_parametersList.add(groupId_commandParameter);
-
-    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    addScene_parametersList.add(sceneId_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    addScene_parametersList.add(transitionTime_commandParameter);
-
-    CommandParameter sceneName_commandParameter = new CommandParameter("sceneName", String.class);
-    addScene_parametersList.add(sceneName_commandParameter);
-
-    CommandParameter clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-    addScene_parametersList.add(clusterId_commandParameter);
-
-    CommandParameter length_commandParameter = new CommandParameter("length", int.class);
-    addScene_parametersList.add(length_commandParameter);
-
-    CommandParameter value_commandParameter = new CommandParameter("value", int.class);
-    addScene_parametersList.add(value_commandParameter);
-
-    addScene_commandInfo.parameters = addScene_parametersList;
-    scenes_clusterInfo.commands.add(addScene_commandInfo);
-    List<CommandParameter> getSceneMembership_parametersList = new ArrayList<>();
-    CommandInfo getSceneMembership_commandInfo = new CommandInfo();
-    getSceneMembership_commandInfo.name = "getSceneMembership";
-    scenes_commandInfo.callbackClass = GetSceneMembershipResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    getSceneMembership_parametersList.add(groupId_commandParameter);
-
-    getSceneMembership_commandInfo.parameters = getSceneMembership_parametersList;
-    scenes_clusterInfo.commands.add(getSceneMembership_commandInfo);
-    List<CommandParameter> recallScene_parametersList = new ArrayList<>();
-    CommandInfo recallScene_commandInfo = new CommandInfo();
-    recallScene_commandInfo.name = "recallScene";
-    scenes_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    recallScene_parametersList.add(groupId_commandParameter);
-
-    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    recallScene_parametersList.add(sceneId_commandParameter);
-
-    CommandParameter transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    recallScene_parametersList.add(transitionTime_commandParameter);
-
-    recallScene_commandInfo.parameters = recallScene_parametersList;
-    scenes_clusterInfo.commands.add(recallScene_commandInfo);
-    List<CommandParameter> removeAllScenes_parametersList = new ArrayList<>();
-    CommandInfo removeAllScenes_commandInfo = new CommandInfo();
-    removeAllScenes_commandInfo.name = "removeAllScenes";
-    scenes_commandInfo.callbackClass = RemoveAllScenesResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    removeAllScenes_parametersList.add(groupId_commandParameter);
-
-    removeAllScenes_commandInfo.parameters = removeAllScenes_parametersList;
-    scenes_clusterInfo.commands.add(removeAllScenes_commandInfo);
-    List<CommandParameter> removeScene_parametersList = new ArrayList<>();
-    CommandInfo removeScene_commandInfo = new CommandInfo();
-    removeScene_commandInfo.name = "removeScene";
-    scenes_commandInfo.callbackClass = RemoveSceneResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    removeScene_parametersList.add(groupId_commandParameter);
-
-    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    removeScene_parametersList.add(sceneId_commandParameter);
-
-    removeScene_commandInfo.parameters = removeScene_parametersList;
-    scenes_clusterInfo.commands.add(removeScene_commandInfo);
-    List<CommandParameter> storeScene_parametersList = new ArrayList<>();
-    CommandInfo storeScene_commandInfo = new CommandInfo();
-    storeScene_commandInfo.name = "storeScene";
-    scenes_commandInfo.callbackClass = StoreSceneResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    storeScene_parametersList.add(groupId_commandParameter);
-
-    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    storeScene_parametersList.add(sceneId_commandParameter);
-
-    storeScene_commandInfo.parameters = storeScene_parametersList;
-    scenes_clusterInfo.commands.add(storeScene_commandInfo);
-    List<CommandParameter> viewScene_parametersList = new ArrayList<>();
-    CommandInfo viewScene_commandInfo = new CommandInfo();
-    viewScene_commandInfo.name = "viewScene";
-    scenes_commandInfo.callbackClass = ViewSceneResponseCallback.class;
-    CommandParameter groupId_commandParameter = new CommandParameter("groupId", int.class);
-    viewScene_parametersList.add(groupId_commandParameter);
-
-    CommandParameter sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    viewScene_parametersList.add(sceneId_commandParameter);
-
-    viewScene_commandInfo.parameters = viewScene_parametersList;
-    scenes_clusterInfo.commands.add(viewScene_commandInfo);
-    clusterInfoMapping.put("scenes", scenes_clusterInfo);
-    ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo("softwareDiagnostics");
-    List<CommandParameter> resetWatermarks_parametersList = new ArrayList<>();
-    CommandInfo resetWatermarks_commandInfo = new CommandInfo();
-    resetWatermarks_commandInfo.name = "resetWatermarks";
-    softwareDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
-    resetWatermarks_commandInfo.parameters = resetWatermarks_parametersList;
-    softwareDiagnostics_clusterInfo.commands.add(resetWatermarks_commandInfo);
-    clusterInfoMapping.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
-    ClusterInfo switch_clusterInfo = new ClusterInfo("switch");
-    clusterInfoMapping.put("switch", switch_clusterInfo);
-    ClusterInfo tvChannel_clusterInfo = new ClusterInfo("tvChannel");
-    List<CommandParameter> changeChannel_parametersList = new ArrayList<>();
-    CommandInfo changeChannel_commandInfo = new CommandInfo();
-    changeChannel_commandInfo.name = "changeChannel";
-    tvChannel_commandInfo.callbackClass = ChangeChannelResponseCallback.class;
-    CommandParameter match_commandParameter = new CommandParameter("match", String.class);
-    changeChannel_parametersList.add(match_commandParameter);
-
-    changeChannel_commandInfo.parameters = changeChannel_parametersList;
-    tvChannel_clusterInfo.commands.add(changeChannel_commandInfo);
-    List<CommandParameter> changeChannelByNumber_parametersList = new ArrayList<>();
-    CommandInfo changeChannelByNumber_commandInfo = new CommandInfo();
-    changeChannelByNumber_commandInfo.name = "changeChannelByNumber";
-    tvChannel_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter majorNumber_commandParameter = new CommandParameter("majorNumber", int.class);
-    changeChannelByNumber_parametersList.add(majorNumber_commandParameter);
-
-    CommandParameter minorNumber_commandParameter = new CommandParameter("minorNumber", int.class);
-    changeChannelByNumber_parametersList.add(minorNumber_commandParameter);
-
-    changeChannelByNumber_commandInfo.parameters = changeChannelByNumber_parametersList;
-    tvChannel_clusterInfo.commands.add(changeChannelByNumber_commandInfo);
-    List<CommandParameter> skipChannel_parametersList = new ArrayList<>();
-    CommandInfo skipChannel_commandInfo = new CommandInfo();
-    skipChannel_commandInfo.name = "skipChannel";
-    tvChannel_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter count_commandParameter = new CommandParameter("count", int.class);
-    skipChannel_parametersList.add(count_commandParameter);
-
-    skipChannel_commandInfo.parameters = skipChannel_parametersList;
-    tvChannel_clusterInfo.commands.add(skipChannel_commandInfo);
-    clusterInfoMapping.put("tvChannel", tvChannel_clusterInfo);
-    ClusterInfo targetNavigator_clusterInfo = new ClusterInfo("targetNavigator");
-    List<CommandParameter> navigateTarget_parametersList = new ArrayList<>();
-    CommandInfo navigateTarget_commandInfo = new CommandInfo();
-    navigateTarget_commandInfo.name = "navigateTarget";
-    targetNavigator_commandInfo.callbackClass = NavigateTargetResponseCallback.class;
-    CommandParameter target_commandParameter = new CommandParameter("target", int.class);
-    navigateTarget_parametersList.add(target_commandParameter);
-
-    CommandParameter data_commandParameter = new CommandParameter("data", String.class);
-    navigateTarget_parametersList.add(data_commandParameter);
-
-    navigateTarget_commandInfo.parameters = navigateTarget_parametersList;
-    targetNavigator_clusterInfo.commands.add(navigateTarget_commandInfo);
-    clusterInfoMapping.put("targetNavigator", targetNavigator_clusterInfo);
-    ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo("temperatureMeasurement");
-    clusterInfoMapping.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
-    ClusterInfo testCluster_clusterInfo = new ClusterInfo("testCluster");
-    List<CommandParameter> test_parametersList = new ArrayList<>();
-    CommandInfo test_commandInfo = new CommandInfo();
-    test_commandInfo.name = "test";
-    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
-    test_commandInfo.parameters = test_parametersList;
-    testCluster_clusterInfo.commands.add(test_commandInfo);
-    List<CommandParameter> testAddArguments_parametersList = new ArrayList<>();
-    CommandInfo testAddArguments_commandInfo = new CommandInfo();
-    testAddArguments_commandInfo.name = "testAddArguments";
-    testCluster_commandInfo.callbackClass = TestAddArgumentsResponseCallback.class;
-    CommandParameter arg1_commandParameter = new CommandParameter("arg1", int.class);
-    testAddArguments_parametersList.add(arg1_commandParameter);
-
-    CommandParameter arg2_commandParameter = new CommandParameter("arg2", int.class);
-    testAddArguments_parametersList.add(arg2_commandParameter);
-
-    testAddArguments_commandInfo.parameters = testAddArguments_parametersList;
-    testCluster_clusterInfo.commands.add(testAddArguments_commandInfo);
-    List<CommandParameter> testNotHandled_parametersList = new ArrayList<>();
-    CommandInfo testNotHandled_commandInfo = new CommandInfo();
-    testNotHandled_commandInfo.name = "testNotHandled";
-    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
-    testNotHandled_commandInfo.parameters = testNotHandled_parametersList;
-    testCluster_clusterInfo.commands.add(testNotHandled_commandInfo);
-    List<CommandParameter> testSpecific_parametersList = new ArrayList<>();
-    CommandInfo testSpecific_commandInfo = new CommandInfo();
-    testSpecific_commandInfo.name = "testSpecific";
-    testCluster_commandInfo.callbackClass = TestSpecificResponseCallback.class;
-    testSpecific_commandInfo.parameters = testSpecific_parametersList;
-    testCluster_clusterInfo.commands.add(testSpecific_commandInfo);
-    List<CommandParameter> testUnknownCommand_parametersList = new ArrayList<>();
-    CommandInfo testUnknownCommand_commandInfo = new CommandInfo();
-    testUnknownCommand_commandInfo.name = "testUnknownCommand";
-    testCluster_commandInfo.callbackClass = DefaultClusterCallback.class;
-    testUnknownCommand_commandInfo.parameters = testUnknownCommand_parametersList;
-    testCluster_clusterInfo.commands.add(testUnknownCommand_commandInfo);
-    clusterInfoMapping.put("testCluster", testCluster_clusterInfo);
-    ClusterInfo thermostat_clusterInfo = new ClusterInfo("thermostat");
-    List<CommandParameter> clearWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo clearWeeklySchedule_commandInfo = new CommandInfo();
-    clearWeeklySchedule_commandInfo.name = "clearWeeklySchedule";
-    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
-    clearWeeklySchedule_commandInfo.parameters = clearWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(clearWeeklySchedule_commandInfo);
-    List<CommandParameter> getRelayStatusLog_parametersList = new ArrayList<>();
-    CommandInfo getRelayStatusLog_commandInfo = new CommandInfo();
-    getRelayStatusLog_commandInfo.name = "getRelayStatusLog";
-    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
-    getRelayStatusLog_commandInfo.parameters = getRelayStatusLog_parametersList;
-    thermostat_clusterInfo.commands.add(getRelayStatusLog_commandInfo);
-    List<CommandParameter> getWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo getWeeklySchedule_commandInfo = new CommandInfo();
-    getWeeklySchedule_commandInfo.name = "getWeeklySchedule";
-    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter daysToReturn_commandParameter =
-        new CommandParameter("daysToReturn", int.class);
-    getWeeklySchedule_parametersList.add(daysToReturn_commandParameter);
-
-    CommandParameter modeToReturn_commandParameter =
-        new CommandParameter("modeToReturn", int.class);
-    getWeeklySchedule_parametersList.add(modeToReturn_commandParameter);
-
-    getWeeklySchedule_commandInfo.parameters = getWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(getWeeklySchedule_commandInfo);
-    List<CommandParameter> setWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo setWeeklySchedule_commandInfo = new CommandInfo();
-    setWeeklySchedule_commandInfo.name = "setWeeklySchedule";
-    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter numberOfTransitionsForSequence_commandParameter =
-        new CommandParameter("numberOfTransitionsForSequence", int.class);
-    setWeeklySchedule_parametersList.add(numberOfTransitionsForSequence_commandParameter);
-
-    CommandParameter dayOfWeekForSequence_commandParameter =
-        new CommandParameter("dayOfWeekForSequence", int.class);
-    setWeeklySchedule_parametersList.add(dayOfWeekForSequence_commandParameter);
-
-    CommandParameter modeForSequence_commandParameter =
-        new CommandParameter("modeForSequence", int.class);
-    setWeeklySchedule_parametersList.add(modeForSequence_commandParameter);
-
-    CommandParameter payload_commandParameter = new CommandParameter("payload", int.class);
-    setWeeklySchedule_parametersList.add(payload_commandParameter);
-
-    setWeeklySchedule_commandInfo.parameters = setWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(setWeeklySchedule_commandInfo);
-    List<CommandParameter> setpointRaiseLower_parametersList = new ArrayList<>();
-    CommandInfo setpointRaiseLower_commandInfo = new CommandInfo();
-    setpointRaiseLower_commandInfo.name = "setpointRaiseLower";
-    thermostat_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter mode_commandParameter = new CommandParameter("mode", int.class);
-    setpointRaiseLower_parametersList.add(mode_commandParameter);
-
-    CommandParameter amount_commandParameter = new CommandParameter("amount", int.class);
-    setpointRaiseLower_parametersList.add(amount_commandParameter);
-
-    setpointRaiseLower_commandInfo.parameters = setpointRaiseLower_parametersList;
-    thermostat_clusterInfo.commands.add(setpointRaiseLower_commandInfo);
-    clusterInfoMapping.put("thermostat", thermostat_clusterInfo);
-    ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo =
-        new ClusterInfo("thermostatUserInterfaceConfiguration");
-    clusterInfoMapping.put(
-        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
-    ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo("threadNetworkDiagnostics");
-    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
-    CommandInfo resetCounts_commandInfo = new CommandInfo();
-    resetCounts_commandInfo.name = "resetCounts";
-    threadNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
-    resetCounts_commandInfo.parameters = resetCounts_parametersList;
-    threadNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
-    clusterInfoMapping.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
-    ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo("wakeOnLan");
-    clusterInfoMapping.put("wakeOnLan", wakeOnLan_clusterInfo);
-    ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo("wiFiNetworkDiagnostics");
-    List<CommandParameter> resetCounts_parametersList = new ArrayList<>();
-    CommandInfo resetCounts_commandInfo = new CommandInfo();
-    resetCounts_commandInfo.name = "resetCounts";
-    wiFiNetworkDiagnostics_commandInfo.callbackClass = DefaultClusterCallback.class;
-    resetCounts_commandInfo.parameters = resetCounts_parametersList;
-    wiFiNetworkDiagnostics_clusterInfo.commands.add(resetCounts_commandInfo);
-    clusterInfoMapping.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
-    ClusterInfo windowCovering_clusterInfo = new ClusterInfo("windowCovering");
-    List<CommandParameter> downOrClose_parametersList = new ArrayList<>();
-    CommandInfo downOrClose_commandInfo = new CommandInfo();
-    downOrClose_commandInfo.name = "downOrClose";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    downOrClose_commandInfo.parameters = downOrClose_parametersList;
-    windowCovering_clusterInfo.commands.add(downOrClose_commandInfo);
-    List<CommandParameter> goToLiftPercentage_parametersList = new ArrayList<>();
-    CommandInfo goToLiftPercentage_commandInfo = new CommandInfo();
-    goToLiftPercentage_commandInfo.name = "goToLiftPercentage";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter liftPercentageValue_commandParameter =
-        new CommandParameter("liftPercentageValue", int.class);
-    goToLiftPercentage_parametersList.add(liftPercentageValue_commandParameter);
-
-    CommandParameter liftPercent100thsValue_commandParameter =
-        new CommandParameter("liftPercent100thsValue", int.class);
-    goToLiftPercentage_parametersList.add(liftPercent100thsValue_commandParameter);
-
-    goToLiftPercentage_commandInfo.parameters = goToLiftPercentage_parametersList;
-    windowCovering_clusterInfo.commands.add(goToLiftPercentage_commandInfo);
-    List<CommandParameter> goToLiftValue_parametersList = new ArrayList<>();
-    CommandInfo goToLiftValue_commandInfo = new CommandInfo();
-    goToLiftValue_commandInfo.name = "goToLiftValue";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter liftValue_commandParameter = new CommandParameter("liftValue", int.class);
-    goToLiftValue_parametersList.add(liftValue_commandParameter);
-
-    goToLiftValue_commandInfo.parameters = goToLiftValue_parametersList;
-    windowCovering_clusterInfo.commands.add(goToLiftValue_commandInfo);
-    List<CommandParameter> goToTiltPercentage_parametersList = new ArrayList<>();
-    CommandInfo goToTiltPercentage_commandInfo = new CommandInfo();
-    goToTiltPercentage_commandInfo.name = "goToTiltPercentage";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter tiltPercentageValue_commandParameter =
-        new CommandParameter("tiltPercentageValue", int.class);
-    goToTiltPercentage_parametersList.add(tiltPercentageValue_commandParameter);
-
-    CommandParameter tiltPercent100thsValue_commandParameter =
-        new CommandParameter("tiltPercent100thsValue", int.class);
-    goToTiltPercentage_parametersList.add(tiltPercent100thsValue_commandParameter);
-
-    goToTiltPercentage_commandInfo.parameters = goToTiltPercentage_parametersList;
-    windowCovering_clusterInfo.commands.add(goToTiltPercentage_commandInfo);
-    List<CommandParameter> goToTiltValue_parametersList = new ArrayList<>();
-    CommandInfo goToTiltValue_commandInfo = new CommandInfo();
-    goToTiltValue_commandInfo.name = "goToTiltValue";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    CommandParameter tiltValue_commandParameter = new CommandParameter("tiltValue", int.class);
-    goToTiltValue_parametersList.add(tiltValue_commandParameter);
-
-    goToTiltValue_commandInfo.parameters = goToTiltValue_parametersList;
-    windowCovering_clusterInfo.commands.add(goToTiltValue_commandInfo);
-    List<CommandParameter> stopMotion_parametersList = new ArrayList<>();
-    CommandInfo stopMotion_commandInfo = new CommandInfo();
-    stopMotion_commandInfo.name = "stopMotion";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    stopMotion_commandInfo.parameters = stopMotion_parametersList;
-    windowCovering_clusterInfo.commands.add(stopMotion_commandInfo);
-    List<CommandParameter> upOrOpen_parametersList = new ArrayList<>();
-    CommandInfo upOrOpen_commandInfo = new CommandInfo();
-    upOrOpen_commandInfo.name = "upOrOpen";
-    windowCovering_commandInfo.callbackClass = DefaultClusterCallback.class;
-    upOrOpen_commandInfo.parameters = upOrOpen_parametersList;
-    windowCovering_clusterInfo.commands.add(upOrOpen_commandInfo);
-    clusterInfoMapping.put("windowCovering", windowCovering_clusterInfo);
-  }
-}
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index bfc01892ee35f9..c671d3b69beab5 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -19,6 +19,7 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 import chip.clusterinfo.ClusterCommandCallback;
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
@@ -7489,5 +7490,2650 @@ public Map<String, ClusterInfo> getClusterMap() {
             windowCoveringClusterCommandInfoMap);
     clusterMap.put("windowCovering", windowCoveringClusterInfo);
     return clusterMap;
+=======
+import chip.clusterinfo.ClusterInfo;
+import chip.clusterinfo.CommandInfo;
+import chip.clusterinfo.CommandParameter;
+import java.util.*;
+
+public class ClusterInfoMapping {
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterInfoMapping = new HashMap<>();
+    ClusterInfo accountLogin_clusterInfo = new ClusterInfo("accountLogin");
+    List<CommandParameter> accountLogin_getSetupPIN_parametersList = new ArrayList<>();
+    CommandInfo accountLogin_getSetupPIN_commandInfo = new CommandInfo();
+    accountLogin_getSetupPIN_commandInfo.name = "getSetupPIN";
+    accountLogin_getSetupPIN_commandInfo.callbackClass =
+        ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class;
+    CommandParameter getSetupPIN_tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    accountLogin_getSetupPIN_parametersList.add(getSetupPIN_tempAccountIdentifier_commandParameter);
+
+    accountLogin_getSetupPIN_commandInfo.parameters = accountLogin_getSetupPIN_parametersList;
+    accountLogin_clusterInfo.commands.add(accountLogin_getSetupPIN_commandInfo);
+    List<CommandParameter> accountLogin_login_parametersList = new ArrayList<>();
+    CommandInfo accountLogin_login_commandInfo = new CommandInfo();
+    accountLogin_login_commandInfo.name = "login";
+    accountLogin_login_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter login_tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    accountLogin_login_parametersList.add(login_tempAccountIdentifier_commandParameter);
+
+    CommandParameter login_setupPIN_commandParameter =
+        new CommandParameter("setupPIN", String.class);
+    accountLogin_login_parametersList.add(login_setupPIN_commandParameter);
+
+    accountLogin_login_commandInfo.parameters = accountLogin_login_parametersList;
+    accountLogin_clusterInfo.commands.add(accountLogin_login_commandInfo);
+    clusterInfoMapping.put("accountLogin", accountLogin_clusterInfo);
+    ClusterInfo administratorCommissioning_clusterInfo =
+        new ClusterInfo("administratorCommissioning");
+    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_parametersList =
+        new ArrayList<>();
+    CommandInfo administratorCommissioning_openBasicCommissioningWindow_commandInfo =
+        new CommandInfo();
+    administratorCommissioning_openBasicCommissioningWindow_commandInfo.name =
+        "openBasicCommissioningWindow";
+    administratorCommissioning_openBasicCommissioningWindow_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter openBasicCommissioningWindow_commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openBasicCommissioningWindow_parametersList.add(
+        openBasicCommissioningWindow_commissioningTimeout_commandParameter);
+
+    administratorCommissioning_openBasicCommissioningWindow_commandInfo.parameters =
+        administratorCommissioning_openBasicCommissioningWindow_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(
+        administratorCommissioning_openBasicCommissioningWindow_commandInfo);
+    List<CommandParameter> administratorCommissioning_openCommissioningWindow_parametersList =
+        new ArrayList<>();
+    CommandInfo administratorCommissioning_openCommissioningWindow_commandInfo = new CommandInfo();
+    administratorCommissioning_openCommissioningWindow_commandInfo.name = "openCommissioningWindow";
+    administratorCommissioning_openCommissioningWindow_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter openCommissioningWindow_commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_commissioningTimeout_commandParameter);
+
+    CommandParameter openCommissioningWindow_PAKEVerifier_commandParameter =
+        new CommandParameter("PAKEVerifier", byte[].class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_PAKEVerifier_commandParameter);
+
+    CommandParameter openCommissioningWindow_discriminator_commandParameter =
+        new CommandParameter("discriminator", int.class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_discriminator_commandParameter);
+
+    CommandParameter openCommissioningWindow_iterations_commandParameter =
+        new CommandParameter("iterations", long.class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_iterations_commandParameter);
+
+    CommandParameter openCommissioningWindow_salt_commandParameter =
+        new CommandParameter("salt", byte[].class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_salt_commandParameter);
+
+    CommandParameter openCommissioningWindow_passcodeID_commandParameter =
+        new CommandParameter("passcodeID", int.class);
+    administratorCommissioning_openCommissioningWindow_parametersList.add(
+        openCommissioningWindow_passcodeID_commandParameter);
+
+    administratorCommissioning_openCommissioningWindow_commandInfo.parameters =
+        administratorCommissioning_openCommissioningWindow_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(
+        administratorCommissioning_openCommissioningWindow_commandInfo);
+    List<CommandParameter> administratorCommissioning_revokeCommissioning_parametersList =
+        new ArrayList<>();
+    CommandInfo administratorCommissioning_revokeCommissioning_commandInfo = new CommandInfo();
+    administratorCommissioning_revokeCommissioning_commandInfo.name = "revokeCommissioning";
+    administratorCommissioning_revokeCommissioning_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    administratorCommissioning_revokeCommissioning_commandInfo.parameters =
+        administratorCommissioning_revokeCommissioning_parametersList;
+    administratorCommissioning_clusterInfo.commands.add(
+        administratorCommissioning_revokeCommissioning_commandInfo);
+    clusterInfoMapping.put("administratorCommissioning", administratorCommissioning_clusterInfo);
+    ClusterInfo applicationBasic_clusterInfo = new ClusterInfo("applicationBasic");
+    List<CommandParameter> applicationBasic_changeStatus_parametersList = new ArrayList<>();
+    CommandInfo applicationBasic_changeStatus_commandInfo = new CommandInfo();
+    applicationBasic_changeStatus_commandInfo.name = "changeStatus";
+    applicationBasic_changeStatus_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter changeStatus_status_commandParameter =
+        new CommandParameter("status", int.class);
+    applicationBasic_changeStatus_parametersList.add(changeStatus_status_commandParameter);
+
+    applicationBasic_changeStatus_commandInfo.parameters =
+        applicationBasic_changeStatus_parametersList;
+    applicationBasic_clusterInfo.commands.add(applicationBasic_changeStatus_commandInfo);
+    clusterInfoMapping.put("applicationBasic", applicationBasic_clusterInfo);
+    ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo("applicationLauncher");
+    List<CommandParameter> applicationLauncher_launchApp_parametersList = new ArrayList<>();
+    CommandInfo applicationLauncher_launchApp_commandInfo = new CommandInfo();
+    applicationLauncher_launchApp_commandInfo.name = "launchApp";
+    applicationLauncher_launchApp_commandInfo.callbackClass =
+        ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class;
+    CommandParameter launchApp_data_commandParameter = new CommandParameter("data", String.class);
+    applicationLauncher_launchApp_parametersList.add(launchApp_data_commandParameter);
+
+    CommandParameter launchApp_catalogVendorId_commandParameter =
+        new CommandParameter("catalogVendorId", int.class);
+    applicationLauncher_launchApp_parametersList.add(launchApp_catalogVendorId_commandParameter);
+
+    CommandParameter launchApp_applicationId_commandParameter =
+        new CommandParameter("applicationId", String.class);
+    applicationLauncher_launchApp_parametersList.add(launchApp_applicationId_commandParameter);
+
+    applicationLauncher_launchApp_commandInfo.parameters =
+        applicationLauncher_launchApp_parametersList;
+    applicationLauncher_clusterInfo.commands.add(applicationLauncher_launchApp_commandInfo);
+    clusterInfoMapping.put("applicationLauncher", applicationLauncher_clusterInfo);
+    ClusterInfo audioOutput_clusterInfo = new ClusterInfo("audioOutput");
+    List<CommandParameter> audioOutput_renameOutput_parametersList = new ArrayList<>();
+    CommandInfo audioOutput_renameOutput_commandInfo = new CommandInfo();
+    audioOutput_renameOutput_commandInfo.name = "renameOutput";
+    audioOutput_renameOutput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter renameOutput_index_commandParameter = new CommandParameter("index", int.class);
+    audioOutput_renameOutput_parametersList.add(renameOutput_index_commandParameter);
+
+    CommandParameter renameOutput_name_commandParameter =
+        new CommandParameter("name", String.class);
+    audioOutput_renameOutput_parametersList.add(renameOutput_name_commandParameter);
+
+    audioOutput_renameOutput_commandInfo.parameters = audioOutput_renameOutput_parametersList;
+    audioOutput_clusterInfo.commands.add(audioOutput_renameOutput_commandInfo);
+    List<CommandParameter> audioOutput_selectOutput_parametersList = new ArrayList<>();
+    CommandInfo audioOutput_selectOutput_commandInfo = new CommandInfo();
+    audioOutput_selectOutput_commandInfo.name = "selectOutput";
+    audioOutput_selectOutput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter selectOutput_index_commandParameter = new CommandParameter("index", int.class);
+    audioOutput_selectOutput_parametersList.add(selectOutput_index_commandParameter);
+
+    audioOutput_selectOutput_commandInfo.parameters = audioOutput_selectOutput_parametersList;
+    audioOutput_clusterInfo.commands.add(audioOutput_selectOutput_commandInfo);
+    clusterInfoMapping.put("audioOutput", audioOutput_clusterInfo);
+    ClusterInfo barrierControl_clusterInfo = new ClusterInfo("barrierControl");
+    List<CommandParameter> barrierControl_barrierControlGoToPercent_parametersList =
+        new ArrayList<>();
+    CommandInfo barrierControl_barrierControlGoToPercent_commandInfo = new CommandInfo();
+    barrierControl_barrierControlGoToPercent_commandInfo.name = "barrierControlGoToPercent";
+    barrierControl_barrierControlGoToPercent_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter barrierControlGoToPercent_percentOpen_commandParameter =
+        new CommandParameter("percentOpen", int.class);
+    barrierControl_barrierControlGoToPercent_parametersList.add(
+        barrierControlGoToPercent_percentOpen_commandParameter);
+
+    barrierControl_barrierControlGoToPercent_commandInfo.parameters =
+        barrierControl_barrierControlGoToPercent_parametersList;
+    barrierControl_clusterInfo.commands.add(barrierControl_barrierControlGoToPercent_commandInfo);
+    List<CommandParameter> barrierControl_barrierControlStop_parametersList = new ArrayList<>();
+    CommandInfo barrierControl_barrierControlStop_commandInfo = new CommandInfo();
+    barrierControl_barrierControlStop_commandInfo.name = "barrierControlStop";
+    barrierControl_barrierControlStop_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    barrierControl_barrierControlStop_commandInfo.parameters =
+        barrierControl_barrierControlStop_parametersList;
+    barrierControl_clusterInfo.commands.add(barrierControl_barrierControlStop_commandInfo);
+    clusterInfoMapping.put("barrierControl", barrierControl_clusterInfo);
+    ClusterInfo basic_clusterInfo = new ClusterInfo("basic");
+    List<CommandParameter> basic_mfgSpecificPing_parametersList = new ArrayList<>();
+    CommandInfo basic_mfgSpecificPing_commandInfo = new CommandInfo();
+    basic_mfgSpecificPing_commandInfo.name = "mfgSpecificPing";
+    basic_mfgSpecificPing_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    basic_mfgSpecificPing_commandInfo.parameters = basic_mfgSpecificPing_parametersList;
+    basic_clusterInfo.commands.add(basic_mfgSpecificPing_commandInfo);
+    clusterInfoMapping.put("basic", basic_clusterInfo);
+    ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo("binaryInputBasic");
+    clusterInfoMapping.put("binaryInputBasic", binaryInputBasic_clusterInfo);
+    ClusterInfo binding_clusterInfo = new ClusterInfo("binding");
+    List<CommandParameter> binding_bind_parametersList = new ArrayList<>();
+    CommandInfo binding_bind_commandInfo = new CommandInfo();
+    binding_bind_commandInfo.name = "bind";
+    binding_bind_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter bind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+    binding_bind_parametersList.add(bind_nodeId_commandParameter);
+
+    CommandParameter bind_groupId_commandParameter = new CommandParameter("groupId", int.class);
+    binding_bind_parametersList.add(bind_groupId_commandParameter);
+
+    CommandParameter bind_endpointId_commandParameter =
+        new CommandParameter("endpointId", int.class);
+    binding_bind_parametersList.add(bind_endpointId_commandParameter);
+
+    CommandParameter bind_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    binding_bind_parametersList.add(bind_clusterId_commandParameter);
+
+    binding_bind_commandInfo.parameters = binding_bind_parametersList;
+    binding_clusterInfo.commands.add(binding_bind_commandInfo);
+    List<CommandParameter> binding_unbind_parametersList = new ArrayList<>();
+    CommandInfo binding_unbind_commandInfo = new CommandInfo();
+    binding_unbind_commandInfo.name = "unbind";
+    binding_unbind_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter unbind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+    binding_unbind_parametersList.add(unbind_nodeId_commandParameter);
+
+    CommandParameter unbind_groupId_commandParameter = new CommandParameter("groupId", int.class);
+    binding_unbind_parametersList.add(unbind_groupId_commandParameter);
+
+    CommandParameter unbind_endpointId_commandParameter =
+        new CommandParameter("endpointId", int.class);
+    binding_unbind_parametersList.add(unbind_endpointId_commandParameter);
+
+    CommandParameter unbind_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    binding_unbind_parametersList.add(unbind_clusterId_commandParameter);
+
+    binding_unbind_commandInfo.parameters = binding_unbind_parametersList;
+    binding_clusterInfo.commands.add(binding_unbind_commandInfo);
+    clusterInfoMapping.put("binding", binding_clusterInfo);
+    ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo("bridgedDeviceBasic");
+    clusterInfoMapping.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
+    ClusterInfo colorControl_clusterInfo = new ClusterInfo("colorControl");
+    List<CommandParameter> colorControl_colorLoopSet_parametersList = new ArrayList<>();
+    CommandInfo colorControl_colorLoopSet_commandInfo = new CommandInfo();
+    colorControl_colorLoopSet_commandInfo.name = "colorLoopSet";
+    colorControl_colorLoopSet_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter colorLoopSet_updateFlags_commandParameter =
+        new CommandParameter("updateFlags", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_updateFlags_commandParameter);
+
+    CommandParameter colorLoopSet_action_commandParameter =
+        new CommandParameter("action", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_action_commandParameter);
+
+    CommandParameter colorLoopSet_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_direction_commandParameter);
+
+    CommandParameter colorLoopSet_time_commandParameter = new CommandParameter("time", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_time_commandParameter);
+
+    CommandParameter colorLoopSet_startHue_commandParameter =
+        new CommandParameter("startHue", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_startHue_commandParameter);
+
+    CommandParameter colorLoopSet_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_optionsMask_commandParameter);
+
+    CommandParameter colorLoopSet_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_colorLoopSet_parametersList.add(colorLoopSet_optionsOverride_commandParameter);
+
+    colorControl_colorLoopSet_commandInfo.parameters = colorControl_colorLoopSet_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_colorLoopSet_commandInfo);
+    List<CommandParameter> colorControl_enhancedMoveHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_enhancedMoveHue_commandInfo = new CommandInfo();
+    colorControl_enhancedMoveHue_commandInfo.name = "enhancedMoveHue";
+    colorControl_enhancedMoveHue_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter enhancedMoveHue_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_moveMode_commandParameter);
+
+    CommandParameter enhancedMoveHue_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_rate_commandParameter);
+
+    CommandParameter enhancedMoveHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_optionsMask_commandParameter);
+
+    CommandParameter enhancedMoveHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveHue_parametersList.add(
+        enhancedMoveHue_optionsOverride_commandParameter);
+
+    colorControl_enhancedMoveHue_commandInfo.parameters =
+        colorControl_enhancedMoveHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveHue_commandInfo);
+    List<CommandParameter> colorControl_enhancedMoveToHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_enhancedMoveToHue_commandInfo = new CommandInfo();
+    colorControl_enhancedMoveToHue_commandInfo.name = "enhancedMoveToHue";
+    colorControl_enhancedMoveToHue_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter enhancedMoveToHue_enhancedHue_commandParameter =
+        new CommandParameter("enhancedHue", int.class);
+    colorControl_enhancedMoveToHue_parametersList.add(
+        enhancedMoveToHue_enhancedHue_commandParameter);
+
+    CommandParameter enhancedMoveToHue_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_enhancedMoveToHue_parametersList.add(enhancedMoveToHue_direction_commandParameter);
+
+    CommandParameter enhancedMoveToHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedMoveToHue_parametersList.add(
+        enhancedMoveToHue_transitionTime_commandParameter);
+
+    CommandParameter enhancedMoveToHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveToHue_parametersList.add(
+        enhancedMoveToHue_optionsMask_commandParameter);
+
+    CommandParameter enhancedMoveToHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveToHue_parametersList.add(
+        enhancedMoveToHue_optionsOverride_commandParameter);
+
+    colorControl_enhancedMoveToHue_commandInfo.parameters =
+        colorControl_enhancedMoveToHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveToHue_commandInfo);
+    List<CommandParameter> colorControl_enhancedMoveToHueAndSaturation_parametersList =
+        new ArrayList<>();
+    CommandInfo colorControl_enhancedMoveToHueAndSaturation_commandInfo = new CommandInfo();
+    colorControl_enhancedMoveToHueAndSaturation_commandInfo.name = "enhancedMoveToHueAndSaturation";
+    colorControl_enhancedMoveToHueAndSaturation_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter enhancedMoveToHueAndSaturation_enhancedHue_commandParameter =
+        new CommandParameter("enhancedHue", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+        enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
+
+    CommandParameter enhancedMoveToHueAndSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+        enhancedMoveToHueAndSaturation_saturation_commandParameter);
+
+    CommandParameter enhancedMoveToHueAndSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+        enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
+
+    CommandParameter enhancedMoveToHueAndSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+        enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
+
+    CommandParameter enhancedMoveToHueAndSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+        enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
+
+    colorControl_enhancedMoveToHueAndSaturation_commandInfo.parameters =
+        colorControl_enhancedMoveToHueAndSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveToHueAndSaturation_commandInfo);
+    List<CommandParameter> colorControl_enhancedStepHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_enhancedStepHue_commandInfo = new CommandInfo();
+    colorControl_enhancedStepHue_commandInfo.name = "enhancedStepHue";
+    colorControl_enhancedStepHue_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter enhancedStepHue_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_stepMode_commandParameter);
+
+    CommandParameter enhancedStepHue_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_stepSize_commandParameter);
+
+    CommandParameter enhancedStepHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedStepHue_parametersList.add(
+        enhancedStepHue_transitionTime_commandParameter);
+
+    CommandParameter enhancedStepHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_optionsMask_commandParameter);
+
+    CommandParameter enhancedStepHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedStepHue_parametersList.add(
+        enhancedStepHue_optionsOverride_commandParameter);
+
+    colorControl_enhancedStepHue_commandInfo.parameters =
+        colorControl_enhancedStepHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_enhancedStepHue_commandInfo);
+    List<CommandParameter> colorControl_moveColor_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveColor_commandInfo = new CommandInfo();
+    colorControl_moveColor_commandInfo.name = "moveColor";
+    colorControl_moveColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveColor_rateX_commandParameter = new CommandParameter("rateX", int.class);
+    colorControl_moveColor_parametersList.add(moveColor_rateX_commandParameter);
+
+    CommandParameter moveColor_rateY_commandParameter = new CommandParameter("rateY", int.class);
+    colorControl_moveColor_parametersList.add(moveColor_rateY_commandParameter);
+
+    CommandParameter moveColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveColor_parametersList.add(moveColor_optionsMask_commandParameter);
+
+    CommandParameter moveColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveColor_parametersList.add(moveColor_optionsOverride_commandParameter);
+
+    colorControl_moveColor_commandInfo.parameters = colorControl_moveColor_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveColor_commandInfo);
+    List<CommandParameter> colorControl_moveColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveColorTemperature_commandInfo = new CommandInfo();
+    colorControl_moveColorTemperature_commandInfo.name = "moveColorTemperature";
+    colorControl_moveColorTemperature_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveColorTemperature_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_moveMode_commandParameter);
+
+    CommandParameter moveColorTemperature_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_rate_commandParameter);
+
+    CommandParameter moveColorTemperature_colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_colorTemperatureMinimum_commandParameter);
+
+    CommandParameter moveColorTemperature_colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_colorTemperatureMaximum_commandParameter);
+
+    CommandParameter moveColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter moveColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveColorTemperature_parametersList.add(
+        moveColorTemperature_optionsOverride_commandParameter);
+
+    colorControl_moveColorTemperature_commandInfo.parameters =
+        colorControl_moveColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveColorTemperature_commandInfo);
+    List<CommandParameter> colorControl_moveHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveHue_commandInfo = new CommandInfo();
+    colorControl_moveHue_commandInfo.name = "moveHue";
+    colorControl_moveHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveHue_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveHue_parametersList.add(moveHue_moveMode_commandParameter);
+
+    CommandParameter moveHue_rate_commandParameter = new CommandParameter("rate", int.class);
+    colorControl_moveHue_parametersList.add(moveHue_rate_commandParameter);
+
+    CommandParameter moveHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveHue_parametersList.add(moveHue_optionsMask_commandParameter);
+
+    CommandParameter moveHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveHue_parametersList.add(moveHue_optionsOverride_commandParameter);
+
+    colorControl_moveHue_commandInfo.parameters = colorControl_moveHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveHue_commandInfo);
+    List<CommandParameter> colorControl_moveSaturation_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveSaturation_commandInfo = new CommandInfo();
+    colorControl_moveSaturation_commandInfo.name = "moveSaturation";
+    colorControl_moveSaturation_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveSaturation_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveSaturation_parametersList.add(moveSaturation_moveMode_commandParameter);
+
+    CommandParameter moveSaturation_rate_commandParameter = new CommandParameter("rate", int.class);
+    colorControl_moveSaturation_parametersList.add(moveSaturation_rate_commandParameter);
+
+    CommandParameter moveSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveSaturation_parametersList.add(moveSaturation_optionsMask_commandParameter);
+
+    CommandParameter moveSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveSaturation_parametersList.add(moveSaturation_optionsOverride_commandParameter);
+
+    colorControl_moveSaturation_commandInfo.parameters = colorControl_moveSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveSaturation_commandInfo);
+    List<CommandParameter> colorControl_moveToColor_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveToColor_commandInfo = new CommandInfo();
+    colorControl_moveToColor_commandInfo.name = "moveToColor";
+    colorControl_moveToColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToColor_colorX_commandParameter =
+        new CommandParameter("colorX", int.class);
+    colorControl_moveToColor_parametersList.add(moveToColor_colorX_commandParameter);
+
+    CommandParameter moveToColor_colorY_commandParameter =
+        new CommandParameter("colorY", int.class);
+    colorControl_moveToColor_parametersList.add(moveToColor_colorY_commandParameter);
+
+    CommandParameter moveToColor_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToColor_parametersList.add(moveToColor_transitionTime_commandParameter);
+
+    CommandParameter moveToColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToColor_parametersList.add(moveToColor_optionsMask_commandParameter);
+
+    CommandParameter moveToColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToColor_parametersList.add(moveToColor_optionsOverride_commandParameter);
+
+    colorControl_moveToColor_commandInfo.parameters = colorControl_moveToColor_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveToColor_commandInfo);
+    List<CommandParameter> colorControl_moveToColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveToColorTemperature_commandInfo = new CommandInfo();
+    colorControl_moveToColorTemperature_commandInfo.name = "moveToColorTemperature";
+    colorControl_moveToColorTemperature_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToColorTemperature_colorTemperature_commandParameter =
+        new CommandParameter("colorTemperature", int.class);
+    colorControl_moveToColorTemperature_parametersList.add(
+        moveToColorTemperature_colorTemperature_commandParameter);
+
+    CommandParameter moveToColorTemperature_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToColorTemperature_parametersList.add(
+        moveToColorTemperature_transitionTime_commandParameter);
+
+    CommandParameter moveToColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToColorTemperature_parametersList.add(
+        moveToColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter moveToColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToColorTemperature_parametersList.add(
+        moveToColorTemperature_optionsOverride_commandParameter);
+
+    colorControl_moveToColorTemperature_commandInfo.parameters =
+        colorControl_moveToColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveToColorTemperature_commandInfo);
+    List<CommandParameter> colorControl_moveToHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveToHue_commandInfo = new CommandInfo();
+    colorControl_moveToHue_commandInfo.name = "moveToHue";
+    colorControl_moveToHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToHue_hue_commandParameter = new CommandParameter("hue", int.class);
+    colorControl_moveToHue_parametersList.add(moveToHue_hue_commandParameter);
+
+    CommandParameter moveToHue_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_moveToHue_parametersList.add(moveToHue_direction_commandParameter);
+
+    CommandParameter moveToHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToHue_parametersList.add(moveToHue_transitionTime_commandParameter);
+
+    CommandParameter moveToHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToHue_parametersList.add(moveToHue_optionsMask_commandParameter);
+
+    CommandParameter moveToHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToHue_parametersList.add(moveToHue_optionsOverride_commandParameter);
+
+    colorControl_moveToHue_commandInfo.parameters = colorControl_moveToHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveToHue_commandInfo);
+    List<CommandParameter> colorControl_moveToHueAndSaturation_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveToHueAndSaturation_commandInfo = new CommandInfo();
+    colorControl_moveToHueAndSaturation_commandInfo.name = "moveToHueAndSaturation";
+    colorControl_moveToHueAndSaturation_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToHueAndSaturation_hue_commandParameter =
+        new CommandParameter("hue", int.class);
+    colorControl_moveToHueAndSaturation_parametersList.add(
+        moveToHueAndSaturation_hue_commandParameter);
+
+    CommandParameter moveToHueAndSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_moveToHueAndSaturation_parametersList.add(
+        moveToHueAndSaturation_saturation_commandParameter);
+
+    CommandParameter moveToHueAndSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToHueAndSaturation_parametersList.add(
+        moveToHueAndSaturation_transitionTime_commandParameter);
+
+    CommandParameter moveToHueAndSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToHueAndSaturation_parametersList.add(
+        moveToHueAndSaturation_optionsMask_commandParameter);
+
+    CommandParameter moveToHueAndSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToHueAndSaturation_parametersList.add(
+        moveToHueAndSaturation_optionsOverride_commandParameter);
+
+    colorControl_moveToHueAndSaturation_commandInfo.parameters =
+        colorControl_moveToHueAndSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveToHueAndSaturation_commandInfo);
+    List<CommandParameter> colorControl_moveToSaturation_parametersList = new ArrayList<>();
+    CommandInfo colorControl_moveToSaturation_commandInfo = new CommandInfo();
+    colorControl_moveToSaturation_commandInfo.name = "moveToSaturation";
+    colorControl_moveToSaturation_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_moveToSaturation_parametersList.add(moveToSaturation_saturation_commandParameter);
+
+    CommandParameter moveToSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToSaturation_parametersList.add(
+        moveToSaturation_transitionTime_commandParameter);
+
+    CommandParameter moveToSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToSaturation_parametersList.add(moveToSaturation_optionsMask_commandParameter);
+
+    CommandParameter moveToSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToSaturation_parametersList.add(
+        moveToSaturation_optionsOverride_commandParameter);
+
+    colorControl_moveToSaturation_commandInfo.parameters =
+        colorControl_moveToSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_moveToSaturation_commandInfo);
+    List<CommandParameter> colorControl_stepColor_parametersList = new ArrayList<>();
+    CommandInfo colorControl_stepColor_commandInfo = new CommandInfo();
+    colorControl_stepColor_commandInfo.name = "stepColor";
+    colorControl_stepColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stepColor_stepX_commandParameter = new CommandParameter("stepX", int.class);
+    colorControl_stepColor_parametersList.add(stepColor_stepX_commandParameter);
+
+    CommandParameter stepColor_stepY_commandParameter = new CommandParameter("stepY", int.class);
+    colorControl_stepColor_parametersList.add(stepColor_stepY_commandParameter);
+
+    CommandParameter stepColor_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepColor_parametersList.add(stepColor_transitionTime_commandParameter);
+
+    CommandParameter stepColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepColor_parametersList.add(stepColor_optionsMask_commandParameter);
+
+    CommandParameter stepColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepColor_parametersList.add(stepColor_optionsOverride_commandParameter);
+
+    colorControl_stepColor_commandInfo.parameters = colorControl_stepColor_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_stepColor_commandInfo);
+    List<CommandParameter> colorControl_stepColorTemperature_parametersList = new ArrayList<>();
+    CommandInfo colorControl_stepColorTemperature_commandInfo = new CommandInfo();
+    colorControl_stepColorTemperature_commandInfo.name = "stepColorTemperature";
+    colorControl_stepColorTemperature_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stepColorTemperature_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_stepMode_commandParameter);
+
+    CommandParameter stepColorTemperature_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_stepSize_commandParameter);
+
+    CommandParameter stepColorTemperature_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_transitionTime_commandParameter);
+
+    CommandParameter stepColorTemperature_colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_colorTemperatureMinimum_commandParameter);
+
+    CommandParameter stepColorTemperature_colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_colorTemperatureMaximum_commandParameter);
+
+    CommandParameter stepColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter stepColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepColorTemperature_parametersList.add(
+        stepColorTemperature_optionsOverride_commandParameter);
+
+    colorControl_stepColorTemperature_commandInfo.parameters =
+        colorControl_stepColorTemperature_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_stepColorTemperature_commandInfo);
+    List<CommandParameter> colorControl_stepHue_parametersList = new ArrayList<>();
+    CommandInfo colorControl_stepHue_commandInfo = new CommandInfo();
+    colorControl_stepHue_commandInfo.name = "stepHue";
+    colorControl_stepHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stepHue_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepHue_parametersList.add(stepHue_stepMode_commandParameter);
+
+    CommandParameter stepHue_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepHue_parametersList.add(stepHue_stepSize_commandParameter);
+
+    CommandParameter stepHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepHue_parametersList.add(stepHue_transitionTime_commandParameter);
+
+    CommandParameter stepHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepHue_parametersList.add(stepHue_optionsMask_commandParameter);
+
+    CommandParameter stepHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepHue_parametersList.add(stepHue_optionsOverride_commandParameter);
+
+    colorControl_stepHue_commandInfo.parameters = colorControl_stepHue_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_stepHue_commandInfo);
+    List<CommandParameter> colorControl_stepSaturation_parametersList = new ArrayList<>();
+    CommandInfo colorControl_stepSaturation_commandInfo = new CommandInfo();
+    colorControl_stepSaturation_commandInfo.name = "stepSaturation";
+    colorControl_stepSaturation_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stepSaturation_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepSaturation_parametersList.add(stepSaturation_stepMode_commandParameter);
+
+    CommandParameter stepSaturation_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepSaturation_parametersList.add(stepSaturation_stepSize_commandParameter);
+
+    CommandParameter stepSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepSaturation_parametersList.add(stepSaturation_transitionTime_commandParameter);
+
+    CommandParameter stepSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepSaturation_parametersList.add(stepSaturation_optionsMask_commandParameter);
+
+    CommandParameter stepSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepSaturation_parametersList.add(stepSaturation_optionsOverride_commandParameter);
+
+    colorControl_stepSaturation_commandInfo.parameters = colorControl_stepSaturation_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_stepSaturation_commandInfo);
+    List<CommandParameter> colorControl_stopMoveStep_parametersList = new ArrayList<>();
+    CommandInfo colorControl_stopMoveStep_commandInfo = new CommandInfo();
+    colorControl_stopMoveStep_commandInfo.name = "stopMoveStep";
+    colorControl_stopMoveStep_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stopMoveStep_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stopMoveStep_parametersList.add(stopMoveStep_optionsMask_commandParameter);
+
+    CommandParameter stopMoveStep_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stopMoveStep_parametersList.add(stopMoveStep_optionsOverride_commandParameter);
+
+    colorControl_stopMoveStep_commandInfo.parameters = colorControl_stopMoveStep_parametersList;
+    colorControl_clusterInfo.commands.add(colorControl_stopMoveStep_commandInfo);
+    clusterInfoMapping.put("colorControl", colorControl_clusterInfo);
+    ClusterInfo contentLauncher_clusterInfo = new ClusterInfo("contentLauncher");
+    List<CommandParameter> contentLauncher_launchContent_parametersList = new ArrayList<>();
+    CommandInfo contentLauncher_launchContent_commandInfo = new CommandInfo();
+    contentLauncher_launchContent_commandInfo.name = "launchContent";
+    contentLauncher_launchContent_commandInfo.callbackClass =
+        ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class;
+    CommandParameter launchContent_autoPlay_commandParameter =
+        new CommandParameter("autoPlay", boolean.class);
+    contentLauncher_launchContent_parametersList.add(launchContent_autoPlay_commandParameter);
+
+    CommandParameter launchContent_data_commandParameter =
+        new CommandParameter("data", String.class);
+    contentLauncher_launchContent_parametersList.add(launchContent_data_commandParameter);
+
+    contentLauncher_launchContent_commandInfo.parameters =
+        contentLauncher_launchContent_parametersList;
+    contentLauncher_clusterInfo.commands.add(contentLauncher_launchContent_commandInfo);
+    List<CommandParameter> contentLauncher_launchURL_parametersList = new ArrayList<>();
+    CommandInfo contentLauncher_launchURL_commandInfo = new CommandInfo();
+    contentLauncher_launchURL_commandInfo.name = "launchURL";
+    contentLauncher_launchURL_commandInfo.callbackClass =
+        ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class;
+    CommandParameter launchURL_contentURL_commandParameter =
+        new CommandParameter("contentURL", String.class);
+    contentLauncher_launchURL_parametersList.add(launchURL_contentURL_commandParameter);
+
+    CommandParameter launchURL_displayString_commandParameter =
+        new CommandParameter("displayString", String.class);
+    contentLauncher_launchURL_parametersList.add(launchURL_displayString_commandParameter);
+
+    contentLauncher_launchURL_commandInfo.parameters = contentLauncher_launchURL_parametersList;
+    contentLauncher_clusterInfo.commands.add(contentLauncher_launchURL_commandInfo);
+    clusterInfoMapping.put("contentLauncher", contentLauncher_clusterInfo);
+    ClusterInfo descriptor_clusterInfo = new ClusterInfo("descriptor");
+    clusterInfoMapping.put("descriptor", descriptor_clusterInfo);
+    ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo("diagnosticLogs");
+    List<CommandParameter> diagnosticLogs_retrieveLogsRequest_parametersList = new ArrayList<>();
+    CommandInfo diagnosticLogs_retrieveLogsRequest_commandInfo = new CommandInfo();
+    diagnosticLogs_retrieveLogsRequest_commandInfo.name = "retrieveLogsRequest";
+    diagnosticLogs_retrieveLogsRequest_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter retrieveLogsRequest_intent_commandParameter =
+        new CommandParameter("intent", int.class);
+    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+        retrieveLogsRequest_intent_commandParameter);
+
+    CommandParameter retrieveLogsRequest_requestedProtocol_commandParameter =
+        new CommandParameter("requestedProtocol", int.class);
+    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+        retrieveLogsRequest_requestedProtocol_commandParameter);
+
+    CommandParameter retrieveLogsRequest_transferFileDesignator_commandParameter =
+        new CommandParameter("transferFileDesignator", byte[].class);
+    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+        retrieveLogsRequest_transferFileDesignator_commandParameter);
+
+    diagnosticLogs_retrieveLogsRequest_commandInfo.parameters =
+        diagnosticLogs_retrieveLogsRequest_parametersList;
+    diagnosticLogs_clusterInfo.commands.add(diagnosticLogs_retrieveLogsRequest_commandInfo);
+    clusterInfoMapping.put("diagnosticLogs", diagnosticLogs_clusterInfo);
+    ClusterInfo doorLock_clusterInfo = new ClusterInfo("doorLock");
+    List<CommandParameter> doorLock_clearAllPins_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearAllPins_commandInfo = new CommandInfo();
+    doorLock_clearAllPins_commandInfo.name = "clearAllPins";
+    doorLock_clearAllPins_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class;
+    doorLock_clearAllPins_commandInfo.parameters = doorLock_clearAllPins_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearAllPins_commandInfo);
+    List<CommandParameter> doorLock_clearAllRfids_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearAllRfids_commandInfo = new CommandInfo();
+    doorLock_clearAllRfids_commandInfo.name = "clearAllRfids";
+    doorLock_clearAllRfids_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class;
+    doorLock_clearAllRfids_commandInfo.parameters = doorLock_clearAllRfids_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearAllRfids_commandInfo);
+    List<CommandParameter> doorLock_clearHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearHolidaySchedule_commandInfo = new CommandInfo();
+    doorLock_clearHolidaySchedule_commandInfo.name = "clearHolidaySchedule";
+    doorLock_clearHolidaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class;
+    CommandParameter clearHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearHolidaySchedule_parametersList.add(
+        clearHolidaySchedule_scheduleId_commandParameter);
+
+    doorLock_clearHolidaySchedule_commandInfo.parameters =
+        doorLock_clearHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearHolidaySchedule_commandInfo);
+    List<CommandParameter> doorLock_clearPin_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearPin_commandInfo = new CommandInfo();
+    doorLock_clearPin_commandInfo.name = "clearPin";
+    doorLock_clearPin_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearPinResponseCallback.class;
+    CommandParameter clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_clearPin_parametersList.add(clearPin_userId_commandParameter);
+
+    doorLock_clearPin_commandInfo.parameters = doorLock_clearPin_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearPin_commandInfo);
+    List<CommandParameter> doorLock_clearRfid_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearRfid_commandInfo = new CommandInfo();
+    doorLock_clearRfid_commandInfo.name = "clearRfid";
+    doorLock_clearRfid_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class;
+    CommandParameter clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_clearRfid_parametersList.add(clearRfid_userId_commandParameter);
+
+    doorLock_clearRfid_commandInfo.parameters = doorLock_clearRfid_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearRfid_commandInfo);
+    List<CommandParameter> doorLock_clearWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearWeekdaySchedule_commandInfo = new CommandInfo();
+    doorLock_clearWeekdaySchedule_commandInfo.name = "clearWeekdaySchedule";
+    doorLock_clearWeekdaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class;
+    CommandParameter clearWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearWeekdaySchedule_parametersList.add(
+        clearWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter clearWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearWeekdaySchedule_parametersList.add(clearWeekdaySchedule_userId_commandParameter);
+
+    doorLock_clearWeekdaySchedule_commandInfo.parameters =
+        doorLock_clearWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearWeekdaySchedule_commandInfo);
+    List<CommandParameter> doorLock_clearYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_clearYeardaySchedule_commandInfo = new CommandInfo();
+    doorLock_clearYeardaySchedule_commandInfo.name = "clearYeardaySchedule";
+    doorLock_clearYeardaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class;
+    CommandParameter clearYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearYeardaySchedule_parametersList.add(
+        clearYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter clearYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearYeardaySchedule_parametersList.add(clearYeardaySchedule_userId_commandParameter);
+
+    doorLock_clearYeardaySchedule_commandInfo.parameters =
+        doorLock_clearYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_clearYeardaySchedule_commandInfo);
+    List<CommandParameter> doorLock_getHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getHolidaySchedule_commandInfo = new CommandInfo();
+    doorLock_getHolidaySchedule_commandInfo.name = "getHolidaySchedule";
+    doorLock_getHolidaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class;
+    CommandParameter getHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getHolidaySchedule_parametersList.add(getHolidaySchedule_scheduleId_commandParameter);
+
+    doorLock_getHolidaySchedule_commandInfo.parameters = doorLock_getHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getHolidaySchedule_commandInfo);
+    List<CommandParameter> doorLock_getLogRecord_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getLogRecord_commandInfo = new CommandInfo();
+    doorLock_getLogRecord_commandInfo.name = "getLogRecord";
+    doorLock_getLogRecord_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class;
+    CommandParameter getLogRecord_logIndex_commandParameter =
+        new CommandParameter("logIndex", int.class);
+    doorLock_getLogRecord_parametersList.add(getLogRecord_logIndex_commandParameter);
+
+    doorLock_getLogRecord_commandInfo.parameters = doorLock_getLogRecord_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getLogRecord_commandInfo);
+    List<CommandParameter> doorLock_getPin_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getPin_commandInfo = new CommandInfo();
+    doorLock_getPin_commandInfo.name = "getPin";
+    doorLock_getPin_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetPinResponseCallback.class;
+    CommandParameter getPin_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_getPin_parametersList.add(getPin_userId_commandParameter);
+
+    doorLock_getPin_commandInfo.parameters = doorLock_getPin_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getPin_commandInfo);
+    List<CommandParameter> doorLock_getRfid_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getRfid_commandInfo = new CommandInfo();
+    doorLock_getRfid_commandInfo.name = "getRfid";
+    doorLock_getRfid_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetRfidResponseCallback.class;
+    CommandParameter getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_getRfid_parametersList.add(getRfid_userId_commandParameter);
+
+    doorLock_getRfid_commandInfo.parameters = doorLock_getRfid_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getRfid_commandInfo);
+    List<CommandParameter> doorLock_getUserType_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getUserType_commandInfo = new CommandInfo();
+    doorLock_getUserType_commandInfo.name = "getUserType";
+    doorLock_getUserType_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class;
+    CommandParameter getUserType_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getUserType_parametersList.add(getUserType_userId_commandParameter);
+
+    doorLock_getUserType_commandInfo.parameters = doorLock_getUserType_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getUserType_commandInfo);
+    List<CommandParameter> doorLock_getWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getWeekdaySchedule_commandInfo = new CommandInfo();
+    doorLock_getWeekdaySchedule_commandInfo.name = "getWeekdaySchedule";
+    doorLock_getWeekdaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class;
+    CommandParameter getWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getWeekdaySchedule_parametersList.add(getWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter getWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getWeekdaySchedule_parametersList.add(getWeekdaySchedule_userId_commandParameter);
+
+    doorLock_getWeekdaySchedule_commandInfo.parameters = doorLock_getWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getWeekdaySchedule_commandInfo);
+    List<CommandParameter> doorLock_getYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_getYeardaySchedule_commandInfo = new CommandInfo();
+    doorLock_getYeardaySchedule_commandInfo.name = "getYeardaySchedule";
+    doorLock_getYeardaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class;
+    CommandParameter getYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getYeardaySchedule_parametersList.add(getYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter getYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getYeardaySchedule_parametersList.add(getYeardaySchedule_userId_commandParameter);
+
+    doorLock_getYeardaySchedule_commandInfo.parameters = doorLock_getYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_getYeardaySchedule_commandInfo);
+    List<CommandParameter> doorLock_lockDoor_parametersList = new ArrayList<>();
+    CommandInfo doorLock_lockDoor_commandInfo = new CommandInfo();
+    doorLock_lockDoor_commandInfo.name = "lockDoor";
+    doorLock_lockDoor_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.LockDoorResponseCallback.class;
+    CommandParameter lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
+    doorLock_lockDoor_parametersList.add(lockDoor_pin_commandParameter);
+
+    doorLock_lockDoor_commandInfo.parameters = doorLock_lockDoor_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_lockDoor_commandInfo);
+    List<CommandParameter> doorLock_setHolidaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setHolidaySchedule_commandInfo = new CommandInfo();
+    doorLock_setHolidaySchedule_commandInfo.name = "setHolidaySchedule";
+    doorLock_setHolidaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class;
+    CommandParameter setHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setHolidaySchedule_parametersList.add(setHolidaySchedule_scheduleId_commandParameter);
+
+    CommandParameter setHolidaySchedule_localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    doorLock_setHolidaySchedule_parametersList.add(
+        setHolidaySchedule_localStartTime_commandParameter);
+
+    CommandParameter setHolidaySchedule_localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    doorLock_setHolidaySchedule_parametersList.add(
+        setHolidaySchedule_localEndTime_commandParameter);
+
+    CommandParameter setHolidaySchedule_operatingModeDuringHoliday_commandParameter =
+        new CommandParameter("operatingModeDuringHoliday", int.class);
+    doorLock_setHolidaySchedule_parametersList.add(
+        setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
+
+    doorLock_setHolidaySchedule_commandInfo.parameters = doorLock_setHolidaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setHolidaySchedule_commandInfo);
+    List<CommandParameter> doorLock_setPin_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setPin_commandInfo = new CommandInfo();
+    doorLock_setPin_commandInfo.name = "setPin";
+    doorLock_setPin_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetPinResponseCallback.class;
+    CommandParameter setPin_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_setPin_parametersList.add(setPin_userId_commandParameter);
+
+    CommandParameter setPin_userStatus_commandParameter =
+        new CommandParameter("userStatus", int.class);
+    doorLock_setPin_parametersList.add(setPin_userStatus_commandParameter);
+
+    CommandParameter setPin_userType_commandParameter = new CommandParameter("userType", int.class);
+    doorLock_setPin_parametersList.add(setPin_userType_commandParameter);
+
+    CommandParameter setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
+    doorLock_setPin_parametersList.add(setPin_pin_commandParameter);
+
+    doorLock_setPin_commandInfo.parameters = doorLock_setPin_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setPin_commandInfo);
+    List<CommandParameter> doorLock_setRfid_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setRfid_commandInfo = new CommandInfo();
+    doorLock_setRfid_commandInfo.name = "setRfid";
+    doorLock_setRfid_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetRfidResponseCallback.class;
+    CommandParameter setRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+    doorLock_setRfid_parametersList.add(setRfid_userId_commandParameter);
+
+    CommandParameter setRfid_userStatus_commandParameter =
+        new CommandParameter("userStatus", int.class);
+    doorLock_setRfid_parametersList.add(setRfid_userStatus_commandParameter);
+
+    CommandParameter setRfid_userType_commandParameter =
+        new CommandParameter("userType", int.class);
+    doorLock_setRfid_parametersList.add(setRfid_userType_commandParameter);
+
+    CommandParameter setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
+    doorLock_setRfid_parametersList.add(setRfid_id_commandParameter);
+
+    doorLock_setRfid_commandInfo.parameters = doorLock_setRfid_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setRfid_commandInfo);
+    List<CommandParameter> doorLock_setUserType_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setUserType_commandInfo = new CommandInfo();
+    doorLock_setUserType_commandInfo.name = "setUserType";
+    doorLock_setUserType_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class;
+    CommandParameter setUserType_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setUserType_parametersList.add(setUserType_userId_commandParameter);
+
+    CommandParameter setUserType_userType_commandParameter =
+        new CommandParameter("userType", int.class);
+    doorLock_setUserType_parametersList.add(setUserType_userType_commandParameter);
+
+    doorLock_setUserType_commandInfo.parameters = doorLock_setUserType_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setUserType_commandInfo);
+    List<CommandParameter> doorLock_setWeekdaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setWeekdaySchedule_commandInfo = new CommandInfo();
+    doorLock_setWeekdaySchedule_commandInfo.name = "setWeekdaySchedule";
+    doorLock_setWeekdaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class;
+    CommandParameter setWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter setWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_userId_commandParameter);
+
+    CommandParameter setWeekdaySchedule_daysMask_commandParameter =
+        new CommandParameter("daysMask", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_daysMask_commandParameter);
+
+    CommandParameter setWeekdaySchedule_startHour_commandParameter =
+        new CommandParameter("startHour", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_startHour_commandParameter);
+
+    CommandParameter setWeekdaySchedule_startMinute_commandParameter =
+        new CommandParameter("startMinute", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_startMinute_commandParameter);
+
+    CommandParameter setWeekdaySchedule_endHour_commandParameter =
+        new CommandParameter("endHour", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_endHour_commandParameter);
+
+    CommandParameter setWeekdaySchedule_endMinute_commandParameter =
+        new CommandParameter("endMinute", int.class);
+    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_endMinute_commandParameter);
+
+    doorLock_setWeekdaySchedule_commandInfo.parameters = doorLock_setWeekdaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setWeekdaySchedule_commandInfo);
+    List<CommandParameter> doorLock_setYeardaySchedule_parametersList = new ArrayList<>();
+    CommandInfo doorLock_setYeardaySchedule_commandInfo = new CommandInfo();
+    doorLock_setYeardaySchedule_commandInfo.name = "setYeardaySchedule";
+    doorLock_setYeardaySchedule_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class;
+    CommandParameter setYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setYeardaySchedule_parametersList.add(setYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter setYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setYeardaySchedule_parametersList.add(setYeardaySchedule_userId_commandParameter);
+
+    CommandParameter setYeardaySchedule_localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    doorLock_setYeardaySchedule_parametersList.add(
+        setYeardaySchedule_localStartTime_commandParameter);
+
+    CommandParameter setYeardaySchedule_localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    doorLock_setYeardaySchedule_parametersList.add(
+        setYeardaySchedule_localEndTime_commandParameter);
+
+    doorLock_setYeardaySchedule_commandInfo.parameters = doorLock_setYeardaySchedule_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_setYeardaySchedule_commandInfo);
+    List<CommandParameter> doorLock_unlockDoor_parametersList = new ArrayList<>();
+    CommandInfo doorLock_unlockDoor_commandInfo = new CommandInfo();
+    doorLock_unlockDoor_commandInfo.name = "unlockDoor";
+    doorLock_unlockDoor_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class;
+    CommandParameter unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
+    doorLock_unlockDoor_parametersList.add(unlockDoor_pin_commandParameter);
+
+    doorLock_unlockDoor_commandInfo.parameters = doorLock_unlockDoor_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_unlockDoor_commandInfo);
+    List<CommandParameter> doorLock_unlockWithTimeout_parametersList = new ArrayList<>();
+    CommandInfo doorLock_unlockWithTimeout_commandInfo = new CommandInfo();
+    doorLock_unlockWithTimeout_commandInfo.name = "unlockWithTimeout";
+    doorLock_unlockWithTimeout_commandInfo.callbackClass =
+        ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class;
+    CommandParameter unlockWithTimeout_timeoutInSeconds_commandParameter =
+        new CommandParameter("timeoutInSeconds", int.class);
+    doorLock_unlockWithTimeout_parametersList.add(
+        unlockWithTimeout_timeoutInSeconds_commandParameter);
+
+    CommandParameter unlockWithTimeout_pin_commandParameter =
+        new CommandParameter("pin", byte[].class);
+    doorLock_unlockWithTimeout_parametersList.add(unlockWithTimeout_pin_commandParameter);
+
+    doorLock_unlockWithTimeout_commandInfo.parameters = doorLock_unlockWithTimeout_parametersList;
+    doorLock_clusterInfo.commands.add(doorLock_unlockWithTimeout_commandInfo);
+    clusterInfoMapping.put("doorLock", doorLock_clusterInfo);
+    ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo("electricalMeasurement");
+    clusterInfoMapping.put("electricalMeasurement", electricalMeasurement_clusterInfo);
+    ClusterInfo ethernetNetworkDiagnostics_clusterInfo =
+        new ClusterInfo("ethernetNetworkDiagnostics");
+    List<CommandParameter> ethernetNetworkDiagnostics_resetCounts_parametersList =
+        new ArrayList<>();
+    CommandInfo ethernetNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
+    ethernetNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
+    ethernetNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    ethernetNetworkDiagnostics_resetCounts_commandInfo.parameters =
+        ethernetNetworkDiagnostics_resetCounts_parametersList;
+    ethernetNetworkDiagnostics_clusterInfo.commands.add(
+        ethernetNetworkDiagnostics_resetCounts_commandInfo);
+    clusterInfoMapping.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
+    ClusterInfo fixedLabel_clusterInfo = new ClusterInfo("fixedLabel");
+    clusterInfoMapping.put("fixedLabel", fixedLabel_clusterInfo);
+    ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo("flowMeasurement");
+    clusterInfoMapping.put("flowMeasurement", flowMeasurement_clusterInfo);
+    ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo("generalCommissioning");
+    List<CommandParameter> generalCommissioning_armFailSafe_parametersList = new ArrayList<>();
+    CommandInfo generalCommissioning_armFailSafe_commandInfo = new CommandInfo();
+    generalCommissioning_armFailSafe_commandInfo.name = "armFailSafe";
+    generalCommissioning_armFailSafe_commandInfo.callbackClass =
+        ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class;
+    CommandParameter armFailSafe_expiryLengthSeconds_commandParameter =
+        new CommandParameter("expiryLengthSeconds", int.class);
+    generalCommissioning_armFailSafe_parametersList.add(
+        armFailSafe_expiryLengthSeconds_commandParameter);
+
+    CommandParameter armFailSafe_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    generalCommissioning_armFailSafe_parametersList.add(armFailSafe_breadcrumb_commandParameter);
+
+    CommandParameter armFailSafe_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    generalCommissioning_armFailSafe_parametersList.add(armFailSafe_timeoutMs_commandParameter);
+
+    generalCommissioning_armFailSafe_commandInfo.parameters =
+        generalCommissioning_armFailSafe_parametersList;
+    generalCommissioning_clusterInfo.commands.add(generalCommissioning_armFailSafe_commandInfo);
+    List<CommandParameter> generalCommissioning_commissioningComplete_parametersList =
+        new ArrayList<>();
+    CommandInfo generalCommissioning_commissioningComplete_commandInfo = new CommandInfo();
+    generalCommissioning_commissioningComplete_commandInfo.name = "commissioningComplete";
+    generalCommissioning_commissioningComplete_commandInfo.callbackClass =
+        ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class;
+    generalCommissioning_commissioningComplete_commandInfo.parameters =
+        generalCommissioning_commissioningComplete_parametersList;
+    generalCommissioning_clusterInfo.commands.add(
+        generalCommissioning_commissioningComplete_commandInfo);
+    List<CommandParameter> generalCommissioning_setRegulatoryConfig_parametersList =
+        new ArrayList<>();
+    CommandInfo generalCommissioning_setRegulatoryConfig_commandInfo = new CommandInfo();
+    generalCommissioning_setRegulatoryConfig_commandInfo.name = "setRegulatoryConfig";
+    generalCommissioning_setRegulatoryConfig_commandInfo.callbackClass =
+        ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class;
+    CommandParameter setRegulatoryConfig_location_commandParameter =
+        new CommandParameter("location", int.class);
+    generalCommissioning_setRegulatoryConfig_parametersList.add(
+        setRegulatoryConfig_location_commandParameter);
+
+    CommandParameter setRegulatoryConfig_countryCode_commandParameter =
+        new CommandParameter("countryCode", String.class);
+    generalCommissioning_setRegulatoryConfig_parametersList.add(
+        setRegulatoryConfig_countryCode_commandParameter);
+
+    CommandParameter setRegulatoryConfig_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    generalCommissioning_setRegulatoryConfig_parametersList.add(
+        setRegulatoryConfig_breadcrumb_commandParameter);
+
+    CommandParameter setRegulatoryConfig_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    generalCommissioning_setRegulatoryConfig_parametersList.add(
+        setRegulatoryConfig_timeoutMs_commandParameter);
+
+    generalCommissioning_setRegulatoryConfig_commandInfo.parameters =
+        generalCommissioning_setRegulatoryConfig_parametersList;
+    generalCommissioning_clusterInfo.commands.add(
+        generalCommissioning_setRegulatoryConfig_commandInfo);
+    clusterInfoMapping.put("generalCommissioning", generalCommissioning_clusterInfo);
+    ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo("generalDiagnostics");
+    clusterInfoMapping.put("generalDiagnostics", generalDiagnostics_clusterInfo);
+    ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo("groupKeyManagement");
+    clusterInfoMapping.put("groupKeyManagement", groupKeyManagement_clusterInfo);
+    ClusterInfo groups_clusterInfo = new ClusterInfo("groups");
+    List<CommandParameter> groups_addGroup_parametersList = new ArrayList<>();
+    CommandInfo groups_addGroup_commandInfo = new CommandInfo();
+    groups_addGroup_commandInfo.name = "addGroup";
+    groups_addGroup_commandInfo.callbackClass =
+        ChipClusters.GroupsCluster.AddGroupResponseCallback.class;
+    CommandParameter addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
+    groups_addGroup_parametersList.add(addGroup_groupId_commandParameter);
+
+    CommandParameter addGroup_groupName_commandParameter =
+        new CommandParameter("groupName", String.class);
+    groups_addGroup_parametersList.add(addGroup_groupName_commandParameter);
+
+    groups_addGroup_commandInfo.parameters = groups_addGroup_parametersList;
+    groups_clusterInfo.commands.add(groups_addGroup_commandInfo);
+    List<CommandParameter> groups_addGroupIfIdentifying_parametersList = new ArrayList<>();
+    CommandInfo groups_addGroupIfIdentifying_commandInfo = new CommandInfo();
+    groups_addGroupIfIdentifying_commandInfo.name = "addGroupIfIdentifying";
+    groups_addGroupIfIdentifying_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter addGroupIfIdentifying_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_addGroupIfIdentifying_parametersList.add(addGroupIfIdentifying_groupId_commandParameter);
+
+    CommandParameter addGroupIfIdentifying_groupName_commandParameter =
+        new CommandParameter("groupName", String.class);
+    groups_addGroupIfIdentifying_parametersList.add(
+        addGroupIfIdentifying_groupName_commandParameter);
+
+    groups_addGroupIfIdentifying_commandInfo.parameters =
+        groups_addGroupIfIdentifying_parametersList;
+    groups_clusterInfo.commands.add(groups_addGroupIfIdentifying_commandInfo);
+    List<CommandParameter> groups_getGroupMembership_parametersList = new ArrayList<>();
+    CommandInfo groups_getGroupMembership_commandInfo = new CommandInfo();
+    groups_getGroupMembership_commandInfo.name = "getGroupMembership";
+    groups_getGroupMembership_commandInfo.callbackClass =
+        ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class;
+    CommandParameter getGroupMembership_groupCount_commandParameter =
+        new CommandParameter("groupCount", int.class);
+    groups_getGroupMembership_parametersList.add(getGroupMembership_groupCount_commandParameter);
+
+    CommandParameter getGroupMembership_groupList_commandParameter =
+        new CommandParameter("groupList", int.class);
+    groups_getGroupMembership_parametersList.add(getGroupMembership_groupList_commandParameter);
+
+    groups_getGroupMembership_commandInfo.parameters = groups_getGroupMembership_parametersList;
+    groups_clusterInfo.commands.add(groups_getGroupMembership_commandInfo);
+    List<CommandParameter> groups_removeAllGroups_parametersList = new ArrayList<>();
+    CommandInfo groups_removeAllGroups_commandInfo = new CommandInfo();
+    groups_removeAllGroups_commandInfo.name = "removeAllGroups";
+    groups_removeAllGroups_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    groups_removeAllGroups_commandInfo.parameters = groups_removeAllGroups_parametersList;
+    groups_clusterInfo.commands.add(groups_removeAllGroups_commandInfo);
+    List<CommandParameter> groups_removeGroup_parametersList = new ArrayList<>();
+    CommandInfo groups_removeGroup_commandInfo = new CommandInfo();
+    groups_removeGroup_commandInfo.name = "removeGroup";
+    groups_removeGroup_commandInfo.callbackClass =
+        ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class;
+    CommandParameter removeGroup_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_removeGroup_parametersList.add(removeGroup_groupId_commandParameter);
+
+    groups_removeGroup_commandInfo.parameters = groups_removeGroup_parametersList;
+    groups_clusterInfo.commands.add(groups_removeGroup_commandInfo);
+    List<CommandParameter> groups_viewGroup_parametersList = new ArrayList<>();
+    CommandInfo groups_viewGroup_commandInfo = new CommandInfo();
+    groups_viewGroup_commandInfo.name = "viewGroup";
+    groups_viewGroup_commandInfo.callbackClass =
+        ChipClusters.GroupsCluster.ViewGroupResponseCallback.class;
+    CommandParameter viewGroup_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_viewGroup_parametersList.add(viewGroup_groupId_commandParameter);
+
+    groups_viewGroup_commandInfo.parameters = groups_viewGroup_parametersList;
+    groups_clusterInfo.commands.add(groups_viewGroup_commandInfo);
+    clusterInfoMapping.put("groups", groups_clusterInfo);
+    ClusterInfo identify_clusterInfo = new ClusterInfo("identify");
+    List<CommandParameter> identify_identify_parametersList = new ArrayList<>();
+    CommandInfo identify_identify_commandInfo = new CommandInfo();
+    identify_identify_commandInfo.name = "identify";
+    identify_identify_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter identify_identifyTime_commandParameter =
+        new CommandParameter("identifyTime", int.class);
+    identify_identify_parametersList.add(identify_identifyTime_commandParameter);
+
+    identify_identify_commandInfo.parameters = identify_identify_parametersList;
+    identify_clusterInfo.commands.add(identify_identify_commandInfo);
+    List<CommandParameter> identify_identifyQuery_parametersList = new ArrayList<>();
+    CommandInfo identify_identifyQuery_commandInfo = new CommandInfo();
+    identify_identifyQuery_commandInfo.name = "identifyQuery";
+    identify_identifyQuery_commandInfo.callbackClass =
+        ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class;
+    identify_identifyQuery_commandInfo.parameters = identify_identifyQuery_parametersList;
+    identify_clusterInfo.commands.add(identify_identifyQuery_commandInfo);
+    List<CommandParameter> identify_triggerEffect_parametersList = new ArrayList<>();
+    CommandInfo identify_triggerEffect_commandInfo = new CommandInfo();
+    identify_triggerEffect_commandInfo.name = "triggerEffect";
+    identify_triggerEffect_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter triggerEffect_effectIdentifier_commandParameter =
+        new CommandParameter("effectIdentifier", int.class);
+    identify_triggerEffect_parametersList.add(triggerEffect_effectIdentifier_commandParameter);
+
+    CommandParameter triggerEffect_effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    identify_triggerEffect_parametersList.add(triggerEffect_effectVariant_commandParameter);
+
+    identify_triggerEffect_commandInfo.parameters = identify_triggerEffect_parametersList;
+    identify_clusterInfo.commands.add(identify_triggerEffect_commandInfo);
+    clusterInfoMapping.put("identify", identify_clusterInfo);
+    ClusterInfo keypadInput_clusterInfo = new ClusterInfo("keypadInput");
+    List<CommandParameter> keypadInput_sendKey_parametersList = new ArrayList<>();
+    CommandInfo keypadInput_sendKey_commandInfo = new CommandInfo();
+    keypadInput_sendKey_commandInfo.name = "sendKey";
+    keypadInput_sendKey_commandInfo.callbackClass =
+        ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class;
+    CommandParameter sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
+    keypadInput_sendKey_parametersList.add(sendKey_keyCode_commandParameter);
+
+    keypadInput_sendKey_commandInfo.parameters = keypadInput_sendKey_parametersList;
+    keypadInput_clusterInfo.commands.add(keypadInput_sendKey_commandInfo);
+    clusterInfoMapping.put("keypadInput", keypadInput_clusterInfo);
+    ClusterInfo levelControl_clusterInfo = new ClusterInfo("levelControl");
+    List<CommandParameter> levelControl_move_parametersList = new ArrayList<>();
+    CommandInfo levelControl_move_commandInfo = new CommandInfo();
+    levelControl_move_commandInfo.name = "move";
+    levelControl_move_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter move_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+    levelControl_move_parametersList.add(move_moveMode_commandParameter);
+
+    CommandParameter move_rate_commandParameter = new CommandParameter("rate", int.class);
+    levelControl_move_parametersList.add(move_rate_commandParameter);
+
+    CommandParameter move_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_move_parametersList.add(move_optionMask_commandParameter);
+
+    CommandParameter move_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_move_parametersList.add(move_optionOverride_commandParameter);
+
+    levelControl_move_commandInfo.parameters = levelControl_move_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_move_commandInfo);
+    List<CommandParameter> levelControl_moveToLevel_parametersList = new ArrayList<>();
+    CommandInfo levelControl_moveToLevel_commandInfo = new CommandInfo();
+    levelControl_moveToLevel_commandInfo.name = "moveToLevel";
+    levelControl_moveToLevel_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToLevel_level_commandParameter = new CommandParameter("level", int.class);
+    levelControl_moveToLevel_parametersList.add(moveToLevel_level_commandParameter);
+
+    CommandParameter moveToLevel_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_moveToLevel_parametersList.add(moveToLevel_transitionTime_commandParameter);
+
+    CommandParameter moveToLevel_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_moveToLevel_parametersList.add(moveToLevel_optionMask_commandParameter);
+
+    CommandParameter moveToLevel_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_moveToLevel_parametersList.add(moveToLevel_optionOverride_commandParameter);
+
+    levelControl_moveToLevel_commandInfo.parameters = levelControl_moveToLevel_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_moveToLevel_commandInfo);
+    List<CommandParameter> levelControl_moveToLevelWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo levelControl_moveToLevelWithOnOff_commandInfo = new CommandInfo();
+    levelControl_moveToLevelWithOnOff_commandInfo.name = "moveToLevelWithOnOff";
+    levelControl_moveToLevelWithOnOff_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveToLevelWithOnOff_level_commandParameter =
+        new CommandParameter("level", int.class);
+    levelControl_moveToLevelWithOnOff_parametersList.add(
+        moveToLevelWithOnOff_level_commandParameter);
+
+    CommandParameter moveToLevelWithOnOff_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_moveToLevelWithOnOff_parametersList.add(
+        moveToLevelWithOnOff_transitionTime_commandParameter);
+
+    levelControl_moveToLevelWithOnOff_commandInfo.parameters =
+        levelControl_moveToLevelWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_moveToLevelWithOnOff_commandInfo);
+    List<CommandParameter> levelControl_moveWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo levelControl_moveWithOnOff_commandInfo = new CommandInfo();
+    levelControl_moveWithOnOff_commandInfo.name = "moveWithOnOff";
+    levelControl_moveWithOnOff_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter moveWithOnOff_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    levelControl_moveWithOnOff_parametersList.add(moveWithOnOff_moveMode_commandParameter);
+
+    CommandParameter moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
+    levelControl_moveWithOnOff_parametersList.add(moveWithOnOff_rate_commandParameter);
+
+    levelControl_moveWithOnOff_commandInfo.parameters = levelControl_moveWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_moveWithOnOff_commandInfo);
+    List<CommandParameter> levelControl_step_parametersList = new ArrayList<>();
+    CommandInfo levelControl_step_commandInfo = new CommandInfo();
+    levelControl_step_commandInfo.name = "step";
+    levelControl_step_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter step_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+    levelControl_step_parametersList.add(step_stepMode_commandParameter);
+
+    CommandParameter step_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+    levelControl_step_parametersList.add(step_stepSize_commandParameter);
+
+    CommandParameter step_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_step_parametersList.add(step_transitionTime_commandParameter);
+
+    CommandParameter step_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_step_parametersList.add(step_optionMask_commandParameter);
+
+    CommandParameter step_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_step_parametersList.add(step_optionOverride_commandParameter);
+
+    levelControl_step_commandInfo.parameters = levelControl_step_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_step_commandInfo);
+    List<CommandParameter> levelControl_stepWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo levelControl_stepWithOnOff_commandInfo = new CommandInfo();
+    levelControl_stepWithOnOff_commandInfo.name = "stepWithOnOff";
+    levelControl_stepWithOnOff_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stepWithOnOff_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_stepMode_commandParameter);
+
+    CommandParameter stepWithOnOff_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_stepSize_commandParameter);
+
+    CommandParameter stepWithOnOff_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_transitionTime_commandParameter);
+
+    levelControl_stepWithOnOff_commandInfo.parameters = levelControl_stepWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_stepWithOnOff_commandInfo);
+    List<CommandParameter> levelControl_stop_parametersList = new ArrayList<>();
+    CommandInfo levelControl_stop_commandInfo = new CommandInfo();
+    levelControl_stop_commandInfo.name = "stop";
+    levelControl_stop_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter stop_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_stop_parametersList.add(stop_optionMask_commandParameter);
+
+    CommandParameter stop_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_stop_parametersList.add(stop_optionOverride_commandParameter);
+
+    levelControl_stop_commandInfo.parameters = levelControl_stop_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_stop_commandInfo);
+    List<CommandParameter> levelControl_stopWithOnOff_parametersList = new ArrayList<>();
+    CommandInfo levelControl_stopWithOnOff_commandInfo = new CommandInfo();
+    levelControl_stopWithOnOff_commandInfo.name = "stopWithOnOff";
+    levelControl_stopWithOnOff_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    levelControl_stopWithOnOff_commandInfo.parameters = levelControl_stopWithOnOff_parametersList;
+    levelControl_clusterInfo.commands.add(levelControl_stopWithOnOff_commandInfo);
+    clusterInfoMapping.put("levelControl", levelControl_clusterInfo);
+    ClusterInfo lowPower_clusterInfo = new ClusterInfo("lowPower");
+    List<CommandParameter> lowPower_sleep_parametersList = new ArrayList<>();
+    CommandInfo lowPower_sleep_commandInfo = new CommandInfo();
+    lowPower_sleep_commandInfo.name = "sleep";
+    lowPower_sleep_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    lowPower_sleep_commandInfo.parameters = lowPower_sleep_parametersList;
+    lowPower_clusterInfo.commands.add(lowPower_sleep_commandInfo);
+    clusterInfoMapping.put("lowPower", lowPower_clusterInfo);
+    ClusterInfo mediaInput_clusterInfo = new ClusterInfo("mediaInput");
+    List<CommandParameter> mediaInput_hideInputStatus_parametersList = new ArrayList<>();
+    CommandInfo mediaInput_hideInputStatus_commandInfo = new CommandInfo();
+    mediaInput_hideInputStatus_commandInfo.name = "hideInputStatus";
+    mediaInput_hideInputStatus_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    mediaInput_hideInputStatus_commandInfo.parameters = mediaInput_hideInputStatus_parametersList;
+    mediaInput_clusterInfo.commands.add(mediaInput_hideInputStatus_commandInfo);
+    List<CommandParameter> mediaInput_renameInput_parametersList = new ArrayList<>();
+    CommandInfo mediaInput_renameInput_commandInfo = new CommandInfo();
+    mediaInput_renameInput_commandInfo.name = "renameInput";
+    mediaInput_renameInput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter renameInput_index_commandParameter = new CommandParameter("index", int.class);
+    mediaInput_renameInput_parametersList.add(renameInput_index_commandParameter);
+
+    CommandParameter renameInput_name_commandParameter = new CommandParameter("name", String.class);
+    mediaInput_renameInput_parametersList.add(renameInput_name_commandParameter);
+
+    mediaInput_renameInput_commandInfo.parameters = mediaInput_renameInput_parametersList;
+    mediaInput_clusterInfo.commands.add(mediaInput_renameInput_commandInfo);
+    List<CommandParameter> mediaInput_selectInput_parametersList = new ArrayList<>();
+    CommandInfo mediaInput_selectInput_commandInfo = new CommandInfo();
+    mediaInput_selectInput_commandInfo.name = "selectInput";
+    mediaInput_selectInput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter selectInput_index_commandParameter = new CommandParameter("index", int.class);
+    mediaInput_selectInput_parametersList.add(selectInput_index_commandParameter);
+
+    mediaInput_selectInput_commandInfo.parameters = mediaInput_selectInput_parametersList;
+    mediaInput_clusterInfo.commands.add(mediaInput_selectInput_commandInfo);
+    List<CommandParameter> mediaInput_showInputStatus_parametersList = new ArrayList<>();
+    CommandInfo mediaInput_showInputStatus_commandInfo = new CommandInfo();
+    mediaInput_showInputStatus_commandInfo.name = "showInputStatus";
+    mediaInput_showInputStatus_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    mediaInput_showInputStatus_commandInfo.parameters = mediaInput_showInputStatus_parametersList;
+    mediaInput_clusterInfo.commands.add(mediaInput_showInputStatus_commandInfo);
+    clusterInfoMapping.put("mediaInput", mediaInput_clusterInfo);
+    ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo("mediaPlayback");
+    List<CommandParameter> mediaPlayback_mediaFastForward_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaFastForward_commandInfo = new CommandInfo();
+    mediaPlayback_mediaFastForward_commandInfo.name = "mediaFastForward";
+    mediaPlayback_mediaFastForward_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class;
+    mediaPlayback_mediaFastForward_commandInfo.parameters =
+        mediaPlayback_mediaFastForward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaFastForward_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaNext_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaNext_commandInfo = new CommandInfo();
+    mediaPlayback_mediaNext_commandInfo.name = "mediaNext";
+    mediaPlayback_mediaNext_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class;
+    mediaPlayback_mediaNext_commandInfo.parameters = mediaPlayback_mediaNext_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaNext_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaPause_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaPause_commandInfo = new CommandInfo();
+    mediaPlayback_mediaPause_commandInfo.name = "mediaPause";
+    mediaPlayback_mediaPause_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class;
+    mediaPlayback_mediaPause_commandInfo.parameters = mediaPlayback_mediaPause_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPause_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaPlay_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaPlay_commandInfo = new CommandInfo();
+    mediaPlayback_mediaPlay_commandInfo.name = "mediaPlay";
+    mediaPlayback_mediaPlay_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class;
+    mediaPlayback_mediaPlay_commandInfo.parameters = mediaPlayback_mediaPlay_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPlay_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaPrevious_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaPrevious_commandInfo = new CommandInfo();
+    mediaPlayback_mediaPrevious_commandInfo.name = "mediaPrevious";
+    mediaPlayback_mediaPrevious_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class;
+    mediaPlayback_mediaPrevious_commandInfo.parameters = mediaPlayback_mediaPrevious_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPrevious_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaRewind_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaRewind_commandInfo = new CommandInfo();
+    mediaPlayback_mediaRewind_commandInfo.name = "mediaRewind";
+    mediaPlayback_mediaRewind_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class;
+    mediaPlayback_mediaRewind_commandInfo.parameters = mediaPlayback_mediaRewind_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaRewind_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaSeek_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaSeek_commandInfo = new CommandInfo();
+    mediaPlayback_mediaSeek_commandInfo.name = "mediaSeek";
+    mediaPlayback_mediaSeek_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class;
+    CommandParameter mediaSeek_position_commandParameter =
+        new CommandParameter("position", long.class);
+    mediaPlayback_mediaSeek_parametersList.add(mediaSeek_position_commandParameter);
+
+    mediaPlayback_mediaSeek_commandInfo.parameters = mediaPlayback_mediaSeek_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSeek_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaSkipBackward_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaSkipBackward_commandInfo = new CommandInfo();
+    mediaPlayback_mediaSkipBackward_commandInfo.name = "mediaSkipBackward";
+    mediaPlayback_mediaSkipBackward_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class;
+    CommandParameter mediaSkipBackward_deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaPlayback_mediaSkipBackward_parametersList.add(
+        mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
+
+    mediaPlayback_mediaSkipBackward_commandInfo.parameters =
+        mediaPlayback_mediaSkipBackward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSkipBackward_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaSkipForward_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaSkipForward_commandInfo = new CommandInfo();
+    mediaPlayback_mediaSkipForward_commandInfo.name = "mediaSkipForward";
+    mediaPlayback_mediaSkipForward_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class;
+    CommandParameter mediaSkipForward_deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaPlayback_mediaSkipForward_parametersList.add(
+        mediaSkipForward_deltaPositionMilliseconds_commandParameter);
+
+    mediaPlayback_mediaSkipForward_commandInfo.parameters =
+        mediaPlayback_mediaSkipForward_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSkipForward_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaStartOver_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaStartOver_commandInfo = new CommandInfo();
+    mediaPlayback_mediaStartOver_commandInfo.name = "mediaStartOver";
+    mediaPlayback_mediaStartOver_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class;
+    mediaPlayback_mediaStartOver_commandInfo.parameters =
+        mediaPlayback_mediaStartOver_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaStartOver_commandInfo);
+    List<CommandParameter> mediaPlayback_mediaStop_parametersList = new ArrayList<>();
+    CommandInfo mediaPlayback_mediaStop_commandInfo = new CommandInfo();
+    mediaPlayback_mediaStop_commandInfo.name = "mediaStop";
+    mediaPlayback_mediaStop_commandInfo.callbackClass =
+        ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class;
+    mediaPlayback_mediaStop_commandInfo.parameters = mediaPlayback_mediaStop_parametersList;
+    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaStop_commandInfo);
+    clusterInfoMapping.put("mediaPlayback", mediaPlayback_clusterInfo);
+    ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo("networkCommissioning");
+    List<CommandParameter> networkCommissioning_addThreadNetwork_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_addThreadNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_addThreadNetwork_commandInfo.name = "addThreadNetwork";
+    networkCommissioning_addThreadNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class;
+    CommandParameter addThreadNetwork_operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    networkCommissioning_addThreadNetwork_parametersList.add(
+        addThreadNetwork_operationalDataset_commandParameter);
+
+    CommandParameter addThreadNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_addThreadNetwork_parametersList.add(
+        addThreadNetwork_breadcrumb_commandParameter);
+
+    CommandParameter addThreadNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_addThreadNetwork_parametersList.add(
+        addThreadNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_addThreadNetwork_commandInfo.parameters =
+        networkCommissioning_addThreadNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(
+        networkCommissioning_addThreadNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_addWiFiNetwork_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_addWiFiNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_addWiFiNetwork_commandInfo.name = "addWiFiNetwork";
+    networkCommissioning_addWiFiNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class;
+    CommandParameter addWiFiNetwork_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_addWiFiNetwork_parametersList.add(addWiFiNetwork_ssid_commandParameter);
+
+    CommandParameter addWiFiNetwork_credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    networkCommissioning_addWiFiNetwork_parametersList.add(
+        addWiFiNetwork_credentials_commandParameter);
+
+    CommandParameter addWiFiNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_addWiFiNetwork_parametersList.add(
+        addWiFiNetwork_breadcrumb_commandParameter);
+
+    CommandParameter addWiFiNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_addWiFiNetwork_parametersList.add(
+        addWiFiNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_addWiFiNetwork_commandInfo.parameters =
+        networkCommissioning_addWiFiNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(networkCommissioning_addWiFiNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_disableNetwork_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_disableNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_disableNetwork_commandInfo.name = "disableNetwork";
+    networkCommissioning_disableNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class;
+    CommandParameter disableNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_disableNetwork_parametersList.add(
+        disableNetwork_networkID_commandParameter);
+
+    CommandParameter disableNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_disableNetwork_parametersList.add(
+        disableNetwork_breadcrumb_commandParameter);
+
+    CommandParameter disableNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_disableNetwork_parametersList.add(
+        disableNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_disableNetwork_commandInfo.parameters =
+        networkCommissioning_disableNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(networkCommissioning_disableNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_enableNetwork_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_enableNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_enableNetwork_commandInfo.name = "enableNetwork";
+    networkCommissioning_enableNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class;
+    CommandParameter enableNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_enableNetwork_parametersList.add(enableNetwork_networkID_commandParameter);
+
+    CommandParameter enableNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_enableNetwork_parametersList.add(
+        enableNetwork_breadcrumb_commandParameter);
+
+    CommandParameter enableNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_enableNetwork_parametersList.add(enableNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_enableNetwork_commandInfo.parameters =
+        networkCommissioning_enableNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(networkCommissioning_enableNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_parametersList =
+        new ArrayList<>();
+    CommandInfo networkCommissioning_getLastNetworkCommissioningResult_commandInfo =
+        new CommandInfo();
+    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.name =
+        "getLastNetworkCommissioningResult";
+    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter getLastNetworkCommissioningResult_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_getLastNetworkCommissioningResult_parametersList.add(
+        getLastNetworkCommissioningResult_timeoutMs_commandParameter);
+
+    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.parameters =
+        networkCommissioning_getLastNetworkCommissioningResult_parametersList;
+    networkCommissioning_clusterInfo.commands.add(
+        networkCommissioning_getLastNetworkCommissioningResult_commandInfo);
+    List<CommandParameter> networkCommissioning_removeNetwork_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_removeNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_removeNetwork_commandInfo.name = "removeNetwork";
+    networkCommissioning_removeNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class;
+    CommandParameter removeNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_removeNetwork_parametersList.add(removeNetwork_networkID_commandParameter);
+
+    CommandParameter removeNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_removeNetwork_parametersList.add(
+        removeNetwork_breadcrumb_commandParameter);
+
+    CommandParameter removeNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_removeNetwork_parametersList.add(removeNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_removeNetwork_commandInfo.parameters =
+        networkCommissioning_removeNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(networkCommissioning_removeNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_scanNetworks_parametersList = new ArrayList<>();
+    CommandInfo networkCommissioning_scanNetworks_commandInfo = new CommandInfo();
+    networkCommissioning_scanNetworks_commandInfo.name = "scanNetworks";
+    networkCommissioning_scanNetworks_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class;
+    CommandParameter scanNetworks_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_ssid_commandParameter);
+
+    CommandParameter scanNetworks_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_breadcrumb_commandParameter);
+
+    CommandParameter scanNetworks_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_timeoutMs_commandParameter);
+
+    networkCommissioning_scanNetworks_commandInfo.parameters =
+        networkCommissioning_scanNetworks_parametersList;
+    networkCommissioning_clusterInfo.commands.add(networkCommissioning_scanNetworks_commandInfo);
+    List<CommandParameter> networkCommissioning_updateThreadNetwork_parametersList =
+        new ArrayList<>();
+    CommandInfo networkCommissioning_updateThreadNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_updateThreadNetwork_commandInfo.name = "updateThreadNetwork";
+    networkCommissioning_updateThreadNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class;
+    CommandParameter updateThreadNetwork_operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    networkCommissioning_updateThreadNetwork_parametersList.add(
+        updateThreadNetwork_operationalDataset_commandParameter);
+
+    CommandParameter updateThreadNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_updateThreadNetwork_parametersList.add(
+        updateThreadNetwork_breadcrumb_commandParameter);
+
+    CommandParameter updateThreadNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_updateThreadNetwork_parametersList.add(
+        updateThreadNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_updateThreadNetwork_commandInfo.parameters =
+        networkCommissioning_updateThreadNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(
+        networkCommissioning_updateThreadNetwork_commandInfo);
+    List<CommandParameter> networkCommissioning_updateWiFiNetwork_parametersList =
+        new ArrayList<>();
+    CommandInfo networkCommissioning_updateWiFiNetwork_commandInfo = new CommandInfo();
+    networkCommissioning_updateWiFiNetwork_commandInfo.name = "updateWiFiNetwork";
+    networkCommissioning_updateWiFiNetwork_commandInfo.callbackClass =
+        ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class;
+    CommandParameter updateWiFiNetwork_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_updateWiFiNetwork_parametersList.add(
+        updateWiFiNetwork_ssid_commandParameter);
+
+    CommandParameter updateWiFiNetwork_credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    networkCommissioning_updateWiFiNetwork_parametersList.add(
+        updateWiFiNetwork_credentials_commandParameter);
+
+    CommandParameter updateWiFiNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_updateWiFiNetwork_parametersList.add(
+        updateWiFiNetwork_breadcrumb_commandParameter);
+
+    CommandParameter updateWiFiNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_updateWiFiNetwork_parametersList.add(
+        updateWiFiNetwork_timeoutMs_commandParameter);
+
+    networkCommissioning_updateWiFiNetwork_commandInfo.parameters =
+        networkCommissioning_updateWiFiNetwork_parametersList;
+    networkCommissioning_clusterInfo.commands.add(
+        networkCommissioning_updateWiFiNetwork_commandInfo);
+    clusterInfoMapping.put("networkCommissioning", networkCommissioning_clusterInfo);
+    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
+        new ClusterInfo("otaSoftwareUpdateProvider");
+    List<CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_parametersList =
+        new ArrayList<>();
+    CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo = new CommandInfo();
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.name = "applyUpdateRequest";
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.callbackClass =
+        ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class;
+    CommandParameter applyUpdateRequest_updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    otaSoftwareUpdateProvider_applyUpdateRequest_parametersList.add(
+        applyUpdateRequest_updateToken_commandParameter);
+
+    CommandParameter applyUpdateRequest_newVersion_commandParameter =
+        new CommandParameter("newVersion", long.class);
+    otaSoftwareUpdateProvider_applyUpdateRequest_parametersList.add(
+        applyUpdateRequest_newVersion_commandParameter);
+
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.parameters =
+        otaSoftwareUpdateProvider_applyUpdateRequest_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(
+        otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo);
+    List<CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList =
+        new ArrayList<>();
+    CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo = new CommandInfo();
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.name = "notifyUpdateApplied";
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter notifyUpdateApplied_updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList.add(
+        notifyUpdateApplied_updateToken_commandParameter);
+
+    CommandParameter notifyUpdateApplied_softwareVersion_commandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList.add(
+        notifyUpdateApplied_softwareVersion_commandParameter);
+
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.parameters =
+        otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(
+        otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo);
+    List<CommandParameter> otaSoftwareUpdateProvider_queryImage_parametersList = new ArrayList<>();
+    CommandInfo otaSoftwareUpdateProvider_queryImage_commandInfo = new CommandInfo();
+    otaSoftwareUpdateProvider_queryImage_commandInfo.name = "queryImage";
+    otaSoftwareUpdateProvider_queryImage_commandInfo.callbackClass =
+        ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class;
+    CommandParameter queryImage_vendorId_commandParameter =
+        new CommandParameter("vendorId", int.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_vendorId_commandParameter);
+
+    CommandParameter queryImage_productId_commandParameter =
+        new CommandParameter("productId", int.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_productId_commandParameter);
+
+    CommandParameter queryImage_hardwareVersion_commandParameter =
+        new CommandParameter("hardwareVersion", int.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+        queryImage_hardwareVersion_commandParameter);
+
+    CommandParameter queryImage_softwareVersion_commandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+        queryImage_softwareVersion_commandParameter);
+
+    CommandParameter queryImage_protocolsSupported_commandParameter =
+        new CommandParameter("protocolsSupported", int.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+        queryImage_protocolsSupported_commandParameter);
+
+    CommandParameter queryImage_location_commandParameter =
+        new CommandParameter("location", String.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_location_commandParameter);
+
+    CommandParameter queryImage_requestorCanConsent_commandParameter =
+        new CommandParameter("requestorCanConsent", boolean.class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+        queryImage_requestorCanConsent_commandParameter);
+
+    CommandParameter queryImage_metadataForProvider_commandParameter =
+        new CommandParameter("metadataForProvider", byte[].class);
+    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+        queryImage_metadataForProvider_commandParameter);
+
+    otaSoftwareUpdateProvider_queryImage_commandInfo.parameters =
+        otaSoftwareUpdateProvider_queryImage_parametersList;
+    otaSoftwareUpdateProvider_clusterInfo.commands.add(
+        otaSoftwareUpdateProvider_queryImage_commandInfo);
+    clusterInfoMapping.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
+    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
+        new ClusterInfo("otaSoftwareUpdateRequestor");
+    List<CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_parametersList =
+        new ArrayList<>();
+    CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo = new CommandInfo();
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.name = "announceOtaProvider";
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter announceOtaProvider_providerLocation_commandParameter =
+        new CommandParameter("providerLocation", byte[].class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+        announceOtaProvider_providerLocation_commandParameter);
+
+    CommandParameter announceOtaProvider_vendorId_commandParameter =
+        new CommandParameter("vendorId", int.class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+        announceOtaProvider_vendorId_commandParameter);
+
+    CommandParameter announceOtaProvider_announcementReason_commandParameter =
+        new CommandParameter("announcementReason", int.class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+        announceOtaProvider_announcementReason_commandParameter);
+
+    CommandParameter announceOtaProvider_metadataForNode_commandParameter =
+        new CommandParameter("metadataForNode", byte[].class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+        announceOtaProvider_metadataForNode_commandParameter);
+
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.parameters =
+        otaSoftwareUpdateRequestor_announceOtaProvider_parametersList;
+    otaSoftwareUpdateRequestor_clusterInfo.commands.add(
+        otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo);
+    clusterInfoMapping.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
+    ClusterInfo occupancySensing_clusterInfo = new ClusterInfo("occupancySensing");
+    clusterInfoMapping.put("occupancySensing", occupancySensing_clusterInfo);
+    ClusterInfo onOff_clusterInfo = new ClusterInfo("onOff");
+    List<CommandParameter> onOff_off_parametersList = new ArrayList<>();
+    CommandInfo onOff_off_commandInfo = new CommandInfo();
+    onOff_off_commandInfo.name = "off";
+    onOff_off_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    onOff_off_commandInfo.parameters = onOff_off_parametersList;
+    onOff_clusterInfo.commands.add(onOff_off_commandInfo);
+    List<CommandParameter> onOff_offWithEffect_parametersList = new ArrayList<>();
+    CommandInfo onOff_offWithEffect_commandInfo = new CommandInfo();
+    onOff_offWithEffect_commandInfo.name = "offWithEffect";
+    onOff_offWithEffect_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter offWithEffect_effectId_commandParameter =
+        new CommandParameter("effectId", int.class);
+    onOff_offWithEffect_parametersList.add(offWithEffect_effectId_commandParameter);
+
+    CommandParameter offWithEffect_effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    onOff_offWithEffect_parametersList.add(offWithEffect_effectVariant_commandParameter);
+
+    onOff_offWithEffect_commandInfo.parameters = onOff_offWithEffect_parametersList;
+    onOff_clusterInfo.commands.add(onOff_offWithEffect_commandInfo);
+    List<CommandParameter> onOff_on_parametersList = new ArrayList<>();
+    CommandInfo onOff_on_commandInfo = new CommandInfo();
+    onOff_on_commandInfo.name = "on";
+    onOff_on_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    onOff_on_commandInfo.parameters = onOff_on_parametersList;
+    onOff_clusterInfo.commands.add(onOff_on_commandInfo);
+    List<CommandParameter> onOff_onWithRecallGlobalScene_parametersList = new ArrayList<>();
+    CommandInfo onOff_onWithRecallGlobalScene_commandInfo = new CommandInfo();
+    onOff_onWithRecallGlobalScene_commandInfo.name = "onWithRecallGlobalScene";
+    onOff_onWithRecallGlobalScene_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    onOff_onWithRecallGlobalScene_commandInfo.parameters =
+        onOff_onWithRecallGlobalScene_parametersList;
+    onOff_clusterInfo.commands.add(onOff_onWithRecallGlobalScene_commandInfo);
+    List<CommandParameter> onOff_onWithTimedOff_parametersList = new ArrayList<>();
+    CommandInfo onOff_onWithTimedOff_commandInfo = new CommandInfo();
+    onOff_onWithTimedOff_commandInfo.name = "onWithTimedOff";
+    onOff_onWithTimedOff_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter onWithTimedOff_onOffControl_commandParameter =
+        new CommandParameter("onOffControl", int.class);
+    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_onOffControl_commandParameter);
+
+    CommandParameter onWithTimedOff_onTime_commandParameter =
+        new CommandParameter("onTime", int.class);
+    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_onTime_commandParameter);
+
+    CommandParameter onWithTimedOff_offWaitTime_commandParameter =
+        new CommandParameter("offWaitTime", int.class);
+    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_offWaitTime_commandParameter);
+
+    onOff_onWithTimedOff_commandInfo.parameters = onOff_onWithTimedOff_parametersList;
+    onOff_clusterInfo.commands.add(onOff_onWithTimedOff_commandInfo);
+    List<CommandParameter> onOff_toggle_parametersList = new ArrayList<>();
+    CommandInfo onOff_toggle_commandInfo = new CommandInfo();
+    onOff_toggle_commandInfo.name = "toggle";
+    onOff_toggle_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    onOff_toggle_commandInfo.parameters = onOff_toggle_parametersList;
+    onOff_clusterInfo.commands.add(onOff_toggle_commandInfo);
+    clusterInfoMapping.put("onOff", onOff_clusterInfo);
+    ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo("onOffSwitchConfiguration");
+    clusterInfoMapping.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
+    ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo("operationalCredentials");
+    List<CommandParameter> operationalCredentials_addNOC_parametersList = new ArrayList<>();
+    CommandInfo operationalCredentials_addNOC_commandInfo = new CommandInfo();
+    operationalCredentials_addNOC_commandInfo.name = "addNOC";
+    operationalCredentials_addNOC_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    CommandParameter addNOC_NOCValue_commandParameter =
+        new CommandParameter("NOCValue", byte[].class);
+    operationalCredentials_addNOC_parametersList.add(addNOC_NOCValue_commandParameter);
+
+    CommandParameter addNOC_ICACValue_commandParameter =
+        new CommandParameter("ICACValue", byte[].class);
+    operationalCredentials_addNOC_parametersList.add(addNOC_ICACValue_commandParameter);
+
+    CommandParameter addNOC_IPKValue_commandParameter =
+        new CommandParameter("IPKValue", byte[].class);
+    operationalCredentials_addNOC_parametersList.add(addNOC_IPKValue_commandParameter);
+
+    CommandParameter addNOC_caseAdminNode_commandParameter =
+        new CommandParameter("caseAdminNode", long.class);
+    operationalCredentials_addNOC_parametersList.add(addNOC_caseAdminNode_commandParameter);
+
+    CommandParameter addNOC_adminVendorId_commandParameter =
+        new CommandParameter("adminVendorId", int.class);
+    operationalCredentials_addNOC_parametersList.add(addNOC_adminVendorId_commandParameter);
+
+    operationalCredentials_addNOC_commandInfo.parameters =
+        operationalCredentials_addNOC_parametersList;
+    operationalCredentials_clusterInfo.commands.add(operationalCredentials_addNOC_commandInfo);
+    List<CommandParameter> operationalCredentials_addTrustedRootCertificate_parametersList =
+        new ArrayList<>();
+    CommandInfo operationalCredentials_addTrustedRootCertificate_commandInfo = new CommandInfo();
+    operationalCredentials_addTrustedRootCertificate_commandInfo.name = "addTrustedRootCertificate";
+    operationalCredentials_addTrustedRootCertificate_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter addTrustedRootCertificate_rootCertificate_commandParameter =
+        new CommandParameter("rootCertificate", byte[].class);
+    operationalCredentials_addTrustedRootCertificate_parametersList.add(
+        addTrustedRootCertificate_rootCertificate_commandParameter);
+
+    operationalCredentials_addTrustedRootCertificate_commandInfo.parameters =
+        operationalCredentials_addTrustedRootCertificate_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_addTrustedRootCertificate_commandInfo);
+    List<CommandParameter> operationalCredentials_attestationRequest_parametersList =
+        new ArrayList<>();
+    CommandInfo operationalCredentials_attestationRequest_commandInfo = new CommandInfo();
+    operationalCredentials_attestationRequest_commandInfo.name = "attestationRequest";
+    operationalCredentials_attestationRequest_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class;
+    CommandParameter attestationRequest_attestationNonce_commandParameter =
+        new CommandParameter("attestationNonce", byte[].class);
+    operationalCredentials_attestationRequest_parametersList.add(
+        attestationRequest_attestationNonce_commandParameter);
+
+    operationalCredentials_attestationRequest_commandInfo.parameters =
+        operationalCredentials_attestationRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_attestationRequest_commandInfo);
+    List<CommandParameter> operationalCredentials_certificateChainRequest_parametersList =
+        new ArrayList<>();
+    CommandInfo operationalCredentials_certificateChainRequest_commandInfo = new CommandInfo();
+    operationalCredentials_certificateChainRequest_commandInfo.name = "certificateChainRequest";
+    operationalCredentials_certificateChainRequest_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class;
+    CommandParameter certificateChainRequest_certificateType_commandParameter =
+        new CommandParameter("certificateType", int.class);
+    operationalCredentials_certificateChainRequest_parametersList.add(
+        certificateChainRequest_certificateType_commandParameter);
+
+    operationalCredentials_certificateChainRequest_commandInfo.parameters =
+        operationalCredentials_certificateChainRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_certificateChainRequest_commandInfo);
+    List<CommandParameter> operationalCredentials_opCSRRequest_parametersList = new ArrayList<>();
+    CommandInfo operationalCredentials_opCSRRequest_commandInfo = new CommandInfo();
+    operationalCredentials_opCSRRequest_commandInfo.name = "opCSRRequest";
+    operationalCredentials_opCSRRequest_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class;
+    CommandParameter opCSRRequest_CSRNonce_commandParameter =
+        new CommandParameter("CSRNonce", byte[].class);
+    operationalCredentials_opCSRRequest_parametersList.add(opCSRRequest_CSRNonce_commandParameter);
+
+    operationalCredentials_opCSRRequest_commandInfo.parameters =
+        operationalCredentials_opCSRRequest_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_opCSRRequest_commandInfo);
+    List<CommandParameter> operationalCredentials_removeFabric_parametersList = new ArrayList<>();
+    CommandInfo operationalCredentials_removeFabric_commandInfo = new CommandInfo();
+    operationalCredentials_removeFabric_commandInfo.name = "removeFabric";
+    operationalCredentials_removeFabric_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    CommandParameter removeFabric_fabricIndex_commandParameter =
+        new CommandParameter("fabricIndex", int.class);
+    operationalCredentials_removeFabric_parametersList.add(
+        removeFabric_fabricIndex_commandParameter);
+
+    operationalCredentials_removeFabric_commandInfo.parameters =
+        operationalCredentials_removeFabric_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_removeFabric_commandInfo);
+    List<CommandParameter> operationalCredentials_removeTrustedRootCertificate_parametersList =
+        new ArrayList<>();
+    CommandInfo operationalCredentials_removeTrustedRootCertificate_commandInfo = new CommandInfo();
+    operationalCredentials_removeTrustedRootCertificate_commandInfo.name =
+        "removeTrustedRootCertificate";
+    operationalCredentials_removeTrustedRootCertificate_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter removeTrustedRootCertificate_trustedRootIdentifier_commandParameter =
+        new CommandParameter("trustedRootIdentifier", byte[].class);
+    operationalCredentials_removeTrustedRootCertificate_parametersList.add(
+        removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
+
+    operationalCredentials_removeTrustedRootCertificate_commandInfo.parameters =
+        operationalCredentials_removeTrustedRootCertificate_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_removeTrustedRootCertificate_commandInfo);
+    List<CommandParameter> operationalCredentials_updateFabricLabel_parametersList =
+        new ArrayList<>();
+    CommandInfo operationalCredentials_updateFabricLabel_commandInfo = new CommandInfo();
+    operationalCredentials_updateFabricLabel_commandInfo.name = "updateFabricLabel";
+    operationalCredentials_updateFabricLabel_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    CommandParameter updateFabricLabel_label_commandParameter =
+        new CommandParameter("label", String.class);
+    operationalCredentials_updateFabricLabel_parametersList.add(
+        updateFabricLabel_label_commandParameter);
+
+    operationalCredentials_updateFabricLabel_commandInfo.parameters =
+        operationalCredentials_updateFabricLabel_parametersList;
+    operationalCredentials_clusterInfo.commands.add(
+        operationalCredentials_updateFabricLabel_commandInfo);
+    List<CommandParameter> operationalCredentials_updateNOC_parametersList = new ArrayList<>();
+    CommandInfo operationalCredentials_updateNOC_commandInfo = new CommandInfo();
+    operationalCredentials_updateNOC_commandInfo.name = "updateNOC";
+    operationalCredentials_updateNOC_commandInfo.callbackClass =
+        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    CommandParameter updateNOC_NOCValue_commandParameter =
+        new CommandParameter("NOCValue", byte[].class);
+    operationalCredentials_updateNOC_parametersList.add(updateNOC_NOCValue_commandParameter);
+
+    CommandParameter updateNOC_ICACValue_commandParameter =
+        new CommandParameter("ICACValue", byte[].class);
+    operationalCredentials_updateNOC_parametersList.add(updateNOC_ICACValue_commandParameter);
+
+    operationalCredentials_updateNOC_commandInfo.parameters =
+        operationalCredentials_updateNOC_parametersList;
+    operationalCredentials_clusterInfo.commands.add(operationalCredentials_updateNOC_commandInfo);
+    clusterInfoMapping.put("operationalCredentials", operationalCredentials_clusterInfo);
+    ClusterInfo powerSource_clusterInfo = new ClusterInfo("powerSource");
+    clusterInfoMapping.put("powerSource", powerSource_clusterInfo);
+    ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo("pressureMeasurement");
+    clusterInfoMapping.put("pressureMeasurement", pressureMeasurement_clusterInfo);
+    ClusterInfo pumpConfigurationAndControl_clusterInfo =
+        new ClusterInfo("pumpConfigurationAndControl");
+    clusterInfoMapping.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
+    ClusterInfo relativeHumidityMeasurement_clusterInfo =
+        new ClusterInfo("relativeHumidityMeasurement");
+    clusterInfoMapping.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
+    ClusterInfo scenes_clusterInfo = new ClusterInfo("scenes");
+    List<CommandParameter> scenes_addScene_parametersList = new ArrayList<>();
+    CommandInfo scenes_addScene_commandInfo = new CommandInfo();
+    scenes_addScene_commandInfo.name = "addScene";
+    scenes_addScene_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.AddSceneResponseCallback.class;
+    CommandParameter addScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+    scenes_addScene_parametersList.add(addScene_groupId_commandParameter);
+
+    CommandParameter addScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+    scenes_addScene_parametersList.add(addScene_sceneId_commandParameter);
+
+    CommandParameter addScene_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    scenes_addScene_parametersList.add(addScene_transitionTime_commandParameter);
+
+    CommandParameter addScene_sceneName_commandParameter =
+        new CommandParameter("sceneName", String.class);
+    scenes_addScene_parametersList.add(addScene_sceneName_commandParameter);
+
+    CommandParameter addScene_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    scenes_addScene_parametersList.add(addScene_clusterId_commandParameter);
+
+    CommandParameter addScene_length_commandParameter = new CommandParameter("length", int.class);
+    scenes_addScene_parametersList.add(addScene_length_commandParameter);
+
+    CommandParameter addScene_value_commandParameter = new CommandParameter("value", int.class);
+    scenes_addScene_parametersList.add(addScene_value_commandParameter);
+
+    scenes_addScene_commandInfo.parameters = scenes_addScene_parametersList;
+    scenes_clusterInfo.commands.add(scenes_addScene_commandInfo);
+    List<CommandParameter> scenes_getSceneMembership_parametersList = new ArrayList<>();
+    CommandInfo scenes_getSceneMembership_commandInfo = new CommandInfo();
+    scenes_getSceneMembership_commandInfo.name = "getSceneMembership";
+    scenes_getSceneMembership_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class;
+    CommandParameter getSceneMembership_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_getSceneMembership_parametersList.add(getSceneMembership_groupId_commandParameter);
+
+    scenes_getSceneMembership_commandInfo.parameters = scenes_getSceneMembership_parametersList;
+    scenes_clusterInfo.commands.add(scenes_getSceneMembership_commandInfo);
+    List<CommandParameter> scenes_recallScene_parametersList = new ArrayList<>();
+    CommandInfo scenes_recallScene_commandInfo = new CommandInfo();
+    scenes_recallScene_commandInfo.name = "recallScene";
+    scenes_recallScene_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter recallScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_recallScene_parametersList.add(recallScene_groupId_commandParameter);
+
+    CommandParameter recallScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_recallScene_parametersList.add(recallScene_sceneId_commandParameter);
+
+    CommandParameter recallScene_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    scenes_recallScene_parametersList.add(recallScene_transitionTime_commandParameter);
+
+    scenes_recallScene_commandInfo.parameters = scenes_recallScene_parametersList;
+    scenes_clusterInfo.commands.add(scenes_recallScene_commandInfo);
+    List<CommandParameter> scenes_removeAllScenes_parametersList = new ArrayList<>();
+    CommandInfo scenes_removeAllScenes_commandInfo = new CommandInfo();
+    scenes_removeAllScenes_commandInfo.name = "removeAllScenes";
+    scenes_removeAllScenes_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class;
+    CommandParameter removeAllScenes_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_removeAllScenes_parametersList.add(removeAllScenes_groupId_commandParameter);
+
+    scenes_removeAllScenes_commandInfo.parameters = scenes_removeAllScenes_parametersList;
+    scenes_clusterInfo.commands.add(scenes_removeAllScenes_commandInfo);
+    List<CommandParameter> scenes_removeScene_parametersList = new ArrayList<>();
+    CommandInfo scenes_removeScene_commandInfo = new CommandInfo();
+    scenes_removeScene_commandInfo.name = "removeScene";
+    scenes_removeScene_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class;
+    CommandParameter removeScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_removeScene_parametersList.add(removeScene_groupId_commandParameter);
+
+    CommandParameter removeScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_removeScene_parametersList.add(removeScene_sceneId_commandParameter);
+
+    scenes_removeScene_commandInfo.parameters = scenes_removeScene_parametersList;
+    scenes_clusterInfo.commands.add(scenes_removeScene_commandInfo);
+    List<CommandParameter> scenes_storeScene_parametersList = new ArrayList<>();
+    CommandInfo scenes_storeScene_commandInfo = new CommandInfo();
+    scenes_storeScene_commandInfo.name = "storeScene";
+    scenes_storeScene_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.StoreSceneResponseCallback.class;
+    CommandParameter storeScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_storeScene_parametersList.add(storeScene_groupId_commandParameter);
+
+    CommandParameter storeScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_storeScene_parametersList.add(storeScene_sceneId_commandParameter);
+
+    scenes_storeScene_commandInfo.parameters = scenes_storeScene_parametersList;
+    scenes_clusterInfo.commands.add(scenes_storeScene_commandInfo);
+    List<CommandParameter> scenes_viewScene_parametersList = new ArrayList<>();
+    CommandInfo scenes_viewScene_commandInfo = new CommandInfo();
+    scenes_viewScene_commandInfo.name = "viewScene";
+    scenes_viewScene_commandInfo.callbackClass =
+        ChipClusters.ScenesCluster.ViewSceneResponseCallback.class;
+    CommandParameter viewScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_viewScene_parametersList.add(viewScene_groupId_commandParameter);
+
+    CommandParameter viewScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_viewScene_parametersList.add(viewScene_sceneId_commandParameter);
+
+    scenes_viewScene_commandInfo.parameters = scenes_viewScene_parametersList;
+    scenes_clusterInfo.commands.add(scenes_viewScene_commandInfo);
+    clusterInfoMapping.put("scenes", scenes_clusterInfo);
+    ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo("softwareDiagnostics");
+    List<CommandParameter> softwareDiagnostics_resetWatermarks_parametersList = new ArrayList<>();
+    CommandInfo softwareDiagnostics_resetWatermarks_commandInfo = new CommandInfo();
+    softwareDiagnostics_resetWatermarks_commandInfo.name = "resetWatermarks";
+    softwareDiagnostics_resetWatermarks_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    softwareDiagnostics_resetWatermarks_commandInfo.parameters =
+        softwareDiagnostics_resetWatermarks_parametersList;
+    softwareDiagnostics_clusterInfo.commands.add(softwareDiagnostics_resetWatermarks_commandInfo);
+    clusterInfoMapping.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
+    ClusterInfo switch_clusterInfo = new ClusterInfo("switch");
+    clusterInfoMapping.put("switch", switch_clusterInfo);
+    ClusterInfo tvChannel_clusterInfo = new ClusterInfo("tvChannel");
+    List<CommandParameter> tvChannel_changeChannel_parametersList = new ArrayList<>();
+    CommandInfo tvChannel_changeChannel_commandInfo = new CommandInfo();
+    tvChannel_changeChannel_commandInfo.name = "changeChannel";
+    tvChannel_changeChannel_commandInfo.callbackClass =
+        ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class;
+    CommandParameter changeChannel_match_commandParameter =
+        new CommandParameter("match", String.class);
+    tvChannel_changeChannel_parametersList.add(changeChannel_match_commandParameter);
+
+    tvChannel_changeChannel_commandInfo.parameters = tvChannel_changeChannel_parametersList;
+    tvChannel_clusterInfo.commands.add(tvChannel_changeChannel_commandInfo);
+    List<CommandParameter> tvChannel_changeChannelByNumber_parametersList = new ArrayList<>();
+    CommandInfo tvChannel_changeChannelByNumber_commandInfo = new CommandInfo();
+    tvChannel_changeChannelByNumber_commandInfo.name = "changeChannelByNumber";
+    tvChannel_changeChannelByNumber_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter changeChannelByNumber_majorNumber_commandParameter =
+        new CommandParameter("majorNumber", int.class);
+    tvChannel_changeChannelByNumber_parametersList.add(
+        changeChannelByNumber_majorNumber_commandParameter);
+
+    CommandParameter changeChannelByNumber_minorNumber_commandParameter =
+        new CommandParameter("minorNumber", int.class);
+    tvChannel_changeChannelByNumber_parametersList.add(
+        changeChannelByNumber_minorNumber_commandParameter);
+
+    tvChannel_changeChannelByNumber_commandInfo.parameters =
+        tvChannel_changeChannelByNumber_parametersList;
+    tvChannel_clusterInfo.commands.add(tvChannel_changeChannelByNumber_commandInfo);
+    List<CommandParameter> tvChannel_skipChannel_parametersList = new ArrayList<>();
+    CommandInfo tvChannel_skipChannel_commandInfo = new CommandInfo();
+    tvChannel_skipChannel_commandInfo.name = "skipChannel";
+    tvChannel_skipChannel_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    CommandParameter skipChannel_count_commandParameter = new CommandParameter("count", int.class);
+    tvChannel_skipChannel_parametersList.add(skipChannel_count_commandParameter);
+
+    tvChannel_skipChannel_commandInfo.parameters = tvChannel_skipChannel_parametersList;
+    tvChannel_clusterInfo.commands.add(tvChannel_skipChannel_commandInfo);
+    clusterInfoMapping.put("tvChannel", tvChannel_clusterInfo);
+    ClusterInfo targetNavigator_clusterInfo = new ClusterInfo("targetNavigator");
+    List<CommandParameter> targetNavigator_navigateTarget_parametersList = new ArrayList<>();
+    CommandInfo targetNavigator_navigateTarget_commandInfo = new CommandInfo();
+    targetNavigator_navigateTarget_commandInfo.name = "navigateTarget";
+    targetNavigator_navigateTarget_commandInfo.callbackClass =
+        ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class;
+    CommandParameter navigateTarget_target_commandParameter =
+        new CommandParameter("target", int.class);
+    targetNavigator_navigateTarget_parametersList.add(navigateTarget_target_commandParameter);
+
+    CommandParameter navigateTarget_data_commandParameter =
+        new CommandParameter("data", String.class);
+    targetNavigator_navigateTarget_parametersList.add(navigateTarget_data_commandParameter);
+
+    targetNavigator_navigateTarget_commandInfo.parameters =
+        targetNavigator_navigateTarget_parametersList;
+    targetNavigator_clusterInfo.commands.add(targetNavigator_navigateTarget_commandInfo);
+    clusterInfoMapping.put("targetNavigator", targetNavigator_clusterInfo);
+    ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo("temperatureMeasurement");
+    clusterInfoMapping.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
+    ClusterInfo testCluster_clusterInfo = new ClusterInfo("testCluster");
+    List<CommandParameter> testCluster_test_parametersList = new ArrayList<>();
+    CommandInfo testCluster_test_commandInfo = new CommandInfo();
+    testCluster_test_commandInfo.name = "test";
+    testCluster_test_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    testCluster_test_commandInfo.parameters = testCluster_test_parametersList;
+    testCluster_clusterInfo.commands.add(testCluster_test_commandInfo);
+    List<CommandParameter> testCluster_testAddArguments_parametersList = new ArrayList<>();
+    CommandInfo testCluster_testAddArguments_commandInfo = new CommandInfo();
+    testCluster_testAddArguments_commandInfo.name = "testAddArguments";
+    testCluster_testAddArguments_commandInfo.callbackClass =
+        ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class;
+    CommandParameter testAddArguments_arg1_commandParameter =
+        new CommandParameter("arg1", int.class);
+    testCluster_testAddArguments_parametersList.add(testAddArguments_arg1_commandParameter);
+
+    CommandParameter testAddArguments_arg2_commandParameter =
+        new CommandParameter("arg2", int.class);
+    testCluster_testAddArguments_parametersList.add(testAddArguments_arg2_commandParameter);
+
+    testCluster_testAddArguments_commandInfo.parameters =
+        testCluster_testAddArguments_parametersList;
+    testCluster_clusterInfo.commands.add(testCluster_testAddArguments_commandInfo);
+    List<CommandParameter> testCluster_testNotHandled_parametersList = new ArrayList<>();
+    CommandInfo testCluster_testNotHandled_commandInfo = new CommandInfo();
+    testCluster_testNotHandled_commandInfo.name = "testNotHandled";
+    testCluster_testNotHandled_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    testCluster_testNotHandled_commandInfo.parameters = testCluster_testNotHandled_parametersList;
+    testCluster_clusterInfo.commands.add(testCluster_testNotHandled_commandInfo);
+    List<CommandParameter> testCluster_testSpecific_parametersList = new ArrayList<>();
+    CommandInfo testCluster_testSpecific_commandInfo = new CommandInfo();
+    testCluster_testSpecific_commandInfo.name = "testSpecific";
+    testCluster_testSpecific_commandInfo.callbackClass =
+        ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class;
+    testCluster_testSpecific_commandInfo.parameters = testCluster_testSpecific_parametersList;
+    testCluster_clusterInfo.commands.add(testCluster_testSpecific_commandInfo);
+    List<CommandParameter> testCluster_testUnknownCommand_parametersList = new ArrayList<>();
+    CommandInfo testCluster_testUnknownCommand_commandInfo = new CommandInfo();
+    testCluster_testUnknownCommand_commandInfo.name = "testUnknownCommand";
+    testCluster_testUnknownCommand_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    testCluster_testUnknownCommand_commandInfo.parameters =
+        testCluster_testUnknownCommand_parametersList;
+    testCluster_clusterInfo.commands.add(testCluster_testUnknownCommand_commandInfo);
+    clusterInfoMapping.put("testCluster", testCluster_clusterInfo);
+    ClusterInfo thermostat_clusterInfo = new ClusterInfo("thermostat");
+    List<CommandParameter> thermostat_clearWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo thermostat_clearWeeklySchedule_commandInfo = new CommandInfo();
+    thermostat_clearWeeklySchedule_commandInfo.name = "clearWeeklySchedule";
+    thermostat_clearWeeklySchedule_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    thermostat_clearWeeklySchedule_commandInfo.parameters =
+        thermostat_clearWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(thermostat_clearWeeklySchedule_commandInfo);
+    List<CommandParameter> thermostat_getRelayStatusLog_parametersList = new ArrayList<>();
+    CommandInfo thermostat_getRelayStatusLog_commandInfo = new CommandInfo();
+    thermostat_getRelayStatusLog_commandInfo.name = "getRelayStatusLog";
+    thermostat_getRelayStatusLog_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    thermostat_getRelayStatusLog_commandInfo.parameters =
+        thermostat_getRelayStatusLog_parametersList;
+    thermostat_clusterInfo.commands.add(thermostat_getRelayStatusLog_commandInfo);
+    List<CommandParameter> thermostat_getWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo thermostat_getWeeklySchedule_commandInfo = new CommandInfo();
+    thermostat_getWeeklySchedule_commandInfo.name = "getWeeklySchedule";
+    thermostat_getWeeklySchedule_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter getWeeklySchedule_daysToReturn_commandParameter =
+        new CommandParameter("daysToReturn", int.class);
+    thermostat_getWeeklySchedule_parametersList.add(
+        getWeeklySchedule_daysToReturn_commandParameter);
+
+    CommandParameter getWeeklySchedule_modeToReturn_commandParameter =
+        new CommandParameter("modeToReturn", int.class);
+    thermostat_getWeeklySchedule_parametersList.add(
+        getWeeklySchedule_modeToReturn_commandParameter);
+
+    thermostat_getWeeklySchedule_commandInfo.parameters =
+        thermostat_getWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(thermostat_getWeeklySchedule_commandInfo);
+    List<CommandParameter> thermostat_setWeeklySchedule_parametersList = new ArrayList<>();
+    CommandInfo thermostat_setWeeklySchedule_commandInfo = new CommandInfo();
+    thermostat_setWeeklySchedule_commandInfo.name = "setWeeklySchedule";
+    thermostat_setWeeklySchedule_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter setWeeklySchedule_numberOfTransitionsForSequence_commandParameter =
+        new CommandParameter("numberOfTransitionsForSequence", int.class);
+    thermostat_setWeeklySchedule_parametersList.add(
+        setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
+
+    CommandParameter setWeeklySchedule_dayOfWeekForSequence_commandParameter =
+        new CommandParameter("dayOfWeekForSequence", int.class);
+    thermostat_setWeeklySchedule_parametersList.add(
+        setWeeklySchedule_dayOfWeekForSequence_commandParameter);
+
+    CommandParameter setWeeklySchedule_modeForSequence_commandParameter =
+        new CommandParameter("modeForSequence", int.class);
+    thermostat_setWeeklySchedule_parametersList.add(
+        setWeeklySchedule_modeForSequence_commandParameter);
+
+    CommandParameter setWeeklySchedule_payload_commandParameter =
+        new CommandParameter("payload", int.class);
+    thermostat_setWeeklySchedule_parametersList.add(setWeeklySchedule_payload_commandParameter);
+
+    thermostat_setWeeklySchedule_commandInfo.parameters =
+        thermostat_setWeeklySchedule_parametersList;
+    thermostat_clusterInfo.commands.add(thermostat_setWeeklySchedule_commandInfo);
+    List<CommandParameter> thermostat_setpointRaiseLower_parametersList = new ArrayList<>();
+    CommandInfo thermostat_setpointRaiseLower_commandInfo = new CommandInfo();
+    thermostat_setpointRaiseLower_commandInfo.name = "setpointRaiseLower";
+    thermostat_setpointRaiseLower_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter setpointRaiseLower_mode_commandParameter =
+        new CommandParameter("mode", int.class);
+    thermostat_setpointRaiseLower_parametersList.add(setpointRaiseLower_mode_commandParameter);
+
+    CommandParameter setpointRaiseLower_amount_commandParameter =
+        new CommandParameter("amount", int.class);
+    thermostat_setpointRaiseLower_parametersList.add(setpointRaiseLower_amount_commandParameter);
+
+    thermostat_setpointRaiseLower_commandInfo.parameters =
+        thermostat_setpointRaiseLower_parametersList;
+    thermostat_clusterInfo.commands.add(thermostat_setpointRaiseLower_commandInfo);
+    clusterInfoMapping.put("thermostat", thermostat_clusterInfo);
+    ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo =
+        new ClusterInfo("thermostatUserInterfaceConfiguration");
+    clusterInfoMapping.put(
+        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
+    ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo("threadNetworkDiagnostics");
+    List<CommandParameter> threadNetworkDiagnostics_resetCounts_parametersList = new ArrayList<>();
+    CommandInfo threadNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
+    threadNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
+    threadNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    threadNetworkDiagnostics_resetCounts_commandInfo.parameters =
+        threadNetworkDiagnostics_resetCounts_parametersList;
+    threadNetworkDiagnostics_clusterInfo.commands.add(
+        threadNetworkDiagnostics_resetCounts_commandInfo);
+    clusterInfoMapping.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
+    ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo("wakeOnLan");
+    clusterInfoMapping.put("wakeOnLan", wakeOnLan_clusterInfo);
+    ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo("wiFiNetworkDiagnostics");
+    List<CommandParameter> wiFiNetworkDiagnostics_resetCounts_parametersList = new ArrayList<>();
+    CommandInfo wiFiNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
+    wiFiNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
+    wiFiNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    wiFiNetworkDiagnostics_resetCounts_commandInfo.parameters =
+        wiFiNetworkDiagnostics_resetCounts_parametersList;
+    wiFiNetworkDiagnostics_clusterInfo.commands.add(wiFiNetworkDiagnostics_resetCounts_commandInfo);
+    clusterInfoMapping.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
+    ClusterInfo windowCovering_clusterInfo = new ClusterInfo("windowCovering");
+    List<CommandParameter> windowCovering_downOrClose_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_downOrClose_commandInfo = new CommandInfo();
+    windowCovering_downOrClose_commandInfo.name = "downOrClose";
+    windowCovering_downOrClose_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    windowCovering_downOrClose_commandInfo.parameters = windowCovering_downOrClose_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_downOrClose_commandInfo);
+    List<CommandParameter> windowCovering_goToLiftPercentage_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_goToLiftPercentage_commandInfo = new CommandInfo();
+    windowCovering_goToLiftPercentage_commandInfo.name = "goToLiftPercentage";
+    windowCovering_goToLiftPercentage_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter goToLiftPercentage_liftPercentageValue_commandParameter =
+        new CommandParameter("liftPercentageValue", int.class);
+    windowCovering_goToLiftPercentage_parametersList.add(
+        goToLiftPercentage_liftPercentageValue_commandParameter);
+
+    CommandParameter goToLiftPercentage_liftPercent100thsValue_commandParameter =
+        new CommandParameter("liftPercent100thsValue", int.class);
+    windowCovering_goToLiftPercentage_parametersList.add(
+        goToLiftPercentage_liftPercent100thsValue_commandParameter);
+
+    windowCovering_goToLiftPercentage_commandInfo.parameters =
+        windowCovering_goToLiftPercentage_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_goToLiftPercentage_commandInfo);
+    List<CommandParameter> windowCovering_goToLiftValue_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_goToLiftValue_commandInfo = new CommandInfo();
+    windowCovering_goToLiftValue_commandInfo.name = "goToLiftValue";
+    windowCovering_goToLiftValue_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter goToLiftValue_liftValue_commandParameter =
+        new CommandParameter("liftValue", int.class);
+    windowCovering_goToLiftValue_parametersList.add(goToLiftValue_liftValue_commandParameter);
+
+    windowCovering_goToLiftValue_commandInfo.parameters =
+        windowCovering_goToLiftValue_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_goToLiftValue_commandInfo);
+    List<CommandParameter> windowCovering_goToTiltPercentage_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_goToTiltPercentage_commandInfo = new CommandInfo();
+    windowCovering_goToTiltPercentage_commandInfo.name = "goToTiltPercentage";
+    windowCovering_goToTiltPercentage_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter goToTiltPercentage_tiltPercentageValue_commandParameter =
+        new CommandParameter("tiltPercentageValue", int.class);
+    windowCovering_goToTiltPercentage_parametersList.add(
+        goToTiltPercentage_tiltPercentageValue_commandParameter);
+
+    CommandParameter goToTiltPercentage_tiltPercent100thsValue_commandParameter =
+        new CommandParameter("tiltPercent100thsValue", int.class);
+    windowCovering_goToTiltPercentage_parametersList.add(
+        goToTiltPercentage_tiltPercent100thsValue_commandParameter);
+
+    windowCovering_goToTiltPercentage_commandInfo.parameters =
+        windowCovering_goToTiltPercentage_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_goToTiltPercentage_commandInfo);
+    List<CommandParameter> windowCovering_goToTiltValue_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_goToTiltValue_commandInfo = new CommandInfo();
+    windowCovering_goToTiltValue_commandInfo.name = "goToTiltValue";
+    windowCovering_goToTiltValue_commandInfo.callbackClass =
+        ChipClusters.DefaultClusterCallback.class;
+    CommandParameter goToTiltValue_tiltValue_commandParameter =
+        new CommandParameter("tiltValue", int.class);
+    windowCovering_goToTiltValue_parametersList.add(goToTiltValue_tiltValue_commandParameter);
+
+    windowCovering_goToTiltValue_commandInfo.parameters =
+        windowCovering_goToTiltValue_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_goToTiltValue_commandInfo);
+    List<CommandParameter> windowCovering_stopMotion_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_stopMotion_commandInfo = new CommandInfo();
+    windowCovering_stopMotion_commandInfo.name = "stopMotion";
+    windowCovering_stopMotion_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    windowCovering_stopMotion_commandInfo.parameters = windowCovering_stopMotion_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_stopMotion_commandInfo);
+    List<CommandParameter> windowCovering_upOrOpen_parametersList = new ArrayList<>();
+    CommandInfo windowCovering_upOrOpen_commandInfo = new CommandInfo();
+    windowCovering_upOrOpen_commandInfo.name = "upOrOpen";
+    windowCovering_upOrOpen_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    windowCovering_upOrOpen_commandInfo.parameters = windowCovering_upOrOpen_parametersList;
+    windowCovering_clusterInfo.commands.add(windowCovering_upOrOpen_commandInfo);
+    clusterInfoMapping.put("windowCovering", windowCovering_clusterInfo);
+    return clusterInfoMapping;
+>>>>>>> a4fd0282e (no error code generation)
   }
 }

From 45fcc82894de1bd072915052d24d4b16767798c3 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Fri, 15 Oct 2021 16:51:21 -0400
Subject: [PATCH 04/38] new design solution

---
 src/controller/java/BUILD.gn                  |    2 +
 .../clusterinfo/ClusterCommandCallback.java   |    9 +
 .../src/chip/clusterinfo/ClusterInfo.java     |   31 +-
 .../src/chip/clusterinfo/CommandInfo.java     |   45 +-
 .../clusterinfo/DelegatedClusterCallback.java |    8 +
 .../java/src/chip/clusterinfo/outline.java    |  179 +
 .../java/templates/ClusterInfo-java.zapt      |   63 +-
 .../devicecontroller/ClusterInfoMapping.java  | 4402 ++++++++++-------
 8 files changed, 3058 insertions(+), 1681 deletions(-)
 create mode 100644 src/controller/java/src/chip/clusterinfo/outline.java

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 5ed60af753f275..10f97aa53ddc10 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -73,6 +73,8 @@ android_library("java") {
     "src/chip/clusterinfo/CommandInfo.java",
     "src/chip/clusterinfo/CommandParameter.java",
     "src/chip/clusterinfo/ParameterType.java",
+    "src/chip/clusterinfo/ClusterCommandCallback.java",
+    "src/chip/clusterinfo/DelegatedClusterCallback.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
 <<<<<<< HEAD
 <<<<<<< HEAD
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index f7cfef34e7b103..2e51407e31f13e 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -1,12 +1,21 @@
 package chip.clusterinfo;
+<<<<<<< HEAD
 
 import java.util.List;
 
 /**
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
+=======
+import java.util.*;
+
+>>>>>>> 2d2bbd2e1 (new design solution)
 public interface ClusterCommandCallback {
   void onSuccess(List<Object> responseValues);
 
   void onFailure(Exception exception);
+<<<<<<< HEAD
+}
+=======
 }
+>>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 5a48fa36b7aa9a..4921b37aca4bf0 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -41,17 +41,36 @@ public interface ClusterConstructor {
 >>>>>>> 505e97db3 (change package)
 =======
 import java.util.*;
+<<<<<<< HEAD
 >>>>>>> a4fd0282e (no error code generation)
+=======
+import chip.devicecontroller.ChipClusters.BaseChipCluster;
+>>>>>>> 2d2bbd2e1 (new design solution)
 
 public class ClusterInfo {
+  private final ClusterConstructor createClusterFunction;
+  private final Map<String, CommandInfo> commands;
 
-  public ClusterInfo(String name) {
-    this.name = name;
-    this.commands = new ArrayList<CommandInfo>();
+  public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
+    this.createClusterFunction = createClusterFunction;
+    this.commands = commands;
   }
-  public String name;
-  public Class<?> clusterClass;
-  public List<CommandInfo> commands;
 
+<<<<<<< HEAD
 }
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+  public ClusterConstructor getCreateClusterFunction() {
+    return createClusterFunction;
+  }
+
+  public Map<String, CommandInfo> getCommands() {
+    return commands;
+  }
+
+  @FunctionalInterface
+  public interface ClusterConstructor {
+    BaseChipCluster create(Long devicePtr, int endpointId);
+  }
+}
+>>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index c7920952a17bb7..4e724cb74fc4de 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -58,19 +58,21 @@ void invokeCommand(
 =======
 import java.util.function.Function;
 import java.util.*;
+<<<<<<< HEAD
 >>>>>>> a4fd0282e (no error code generation)
 
+=======
+import java.util.function.Supplier;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.devicecontroller.ChipClusters.BaseChipCluster;
+>>>>>>> 2d2bbd2e1 (new design solution)
 
 public class CommandInfo {
-  // TODO make Class<?> to ClusterResponse
-  public CommandInfo(String name, Function<List<CommandParameter>, Class<?>> fn, List<CommandParameter> parameters, Class<?> callbackClass) {
-    this.name = name;
-    this.fn = fn;
-    this.parameters = parameters;
-    this.callbackClass = callbackClass;
-  }
-  public CommandInfo() {}
+  public ClusterCommandFunction commandFunction;
+  private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
+  private List<CommandParameter> commandParameters;
 
+<<<<<<< HEAD
   public String name;
   public Function<List<CommandParameter>, Class<?>> fn;
   public List<CommandParameter> parameters;
@@ -82,3 +84,30 @@ >>>>>>> cdefa1b91 (basic code generation template, but not able to import to too
   public Class<?> callbackClass;
 }
 >>>>>>> a4fd0282e (no error code generation)
+=======
+
+  public CommandInfo(ClusterCommandFunction commandFunction,
+      Supplier<DelegatedClusterCallback> commandCallbackSupplier, List<CommandParameter> commandParameters) {
+    this.commandFunction = commandFunction;
+    this.commandCallbackSupplier = commandCallbackSupplier;
+    this.commandParameters = commandParameters;
+  }
+
+  public ClusterCommandFunction getCommandFunction() {
+    return commandFunction;
+  }
+
+  public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
+    return commandCallbackSupplier;
+  }
+
+  public List<CommandParameter> getCommandParameters() {
+    return commandParameters;
+  }
+
+  @FunctionalInterface
+  interface ClusterCommandFunction {
+    void invokeCommand(BaseChipCluster cluster, Object callback, List<Object> commandArguments);
+  }
+}
+>>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index e2f21cb6526041..dac45e30e7b458 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -1,6 +1,14 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }
+=======
+import chip.clusterinfo.ClusterCommandCallback;
+
+public interface DelegatedClusterCallback {
+  void setCallbackDelegate(ClusterCommandCallback callback);
+}
+>>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/src/chip/clusterinfo/outline.java b/src/controller/java/src/chip/clusterinfo/outline.java
new file mode 100644
index 00000000000000..c8261542b017a3
--- /dev/null
+++ b/src/controller/java/src/chip/clusterinfo/outline.java
@@ -0,0 +1,179 @@
+package com.google.chip.chiptool.clusterclient;
+
+import chip.devicecontroller.ChipClusters.BaseChipCluster;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
+import chip.devicecontroller.ChipClusters.OnOffCluster;
+import chip.devicecontroller.ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+public class ClusterInfo {
+  private final ClusterConstructor createClusterFunction;
+  private final Map<String, CommandInfo> commands;
+
+  public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
+    this.createClusterFunction = createClusterFunction;
+    this.commands = commands;
+  }
+
+  public ClusterConstructor getCreateClusterFunction() {
+    return createClusterFunction;
+  }
+
+  public Map<String, CommandInfo> getCommands() {
+    return commands;
+  }
+
+  @FunctionalInterface
+  interface ClusterConstructor {
+    BaseChipCluster create(Long devicePtr, int endpointId);
+  }
+}
+
+class CommandInfo {
+  private ClusterCommandFunction commandFunction;
+  private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
+  private List<CommandParameter> commandParameters;
+
+
+  public CommandInfo(ClusterCommandFunction commandFunction,
+      Supplier<DelegatedClusterCallback> commandCallbackSupplier, List<CommandParameter> commandParameters) {
+    this.commandFunction = commandFunction;
+    this.commandCallbackSupplier = commandCallbackSupplier;
+    this.commandParameters = commandParameters;
+  }
+
+  public ClusterCommandFunction getCommandFunction() {
+    return commandFunction;
+  }
+
+  public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
+    return commandCallbackSupplier;
+  }
+
+  public List<CommandParameter> getCommandParameters() {
+    return commandParameters;
+  }
+
+  @FunctionalInterface
+  interface ClusterCommandFunction {
+    void invokeCommand(BaseChipCluster cluster, Object callback, List<Object> commandArguments);
+  }
+}
+
+class CommandParameter {
+
+}
+
+// generated code
+interface ClusterCommandCallback {
+  void onSuccess(List<Object> responseValues);
+  void onFailure(Exception exception);
+}
+
+interface DelegatedClusterCallback {
+  void setCallbackDelegate(ClusterCommandCallback callback);
+}
+
+// Demoing DelegatedAttestationResponseCallback since AttestationResponseCallback has non-default success parameters.
+// In the template: Generate a Delegated{{... name}} for every cluster callback type.
+class DelegatedAttestationResponseCallback implements AttestationResponseCallback, DelegatedClusterCallback {
+  private ClusterCommandCallback callback;
+
+  @Override
+  public void setCallbackDelegate(ClusterCommandCallback callback) {
+    this.callback = callback;
+  }
+
+  // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+  @Override
+  public void onSuccess(byte[] attestationElements, byte[] signature) {
+    List<Object> responseValues = new ArrayList<>();
+    responseValues.add(attestationElements);
+    responseValues.add(signature);
+    callback.onSuccess(responseValues);
+  }
+
+  @Override
+  public void onError(Exception e) {
+    callback.onFailure(e);
+  }
+}
+
+class ExampleCode {
+  // GENERATED CODE: Should be created by the template.
+  static Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+
+    // Populate parameters
+    List<CommandParameter> commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+    CommandParameter effectId = new CommandParameter();
+    CommandParameter effectVariant = new CommandParameter();
+    commandParams.add(effectId);
+    commandParams.add(effectVariant);
+
+    // Populate commands
+    Map<String, CommandInfo> onOffClusterCommandInfo = new HashMap<>();
+    CommandInfo offWithEffectCommandInfo = new CommandInfo(
+        (cluster, callback, commandArguments) -> {
+          // TODO: expose index in template helper
+          ((OnOffCluster) cluster)
+              .offWithEffect((DefaultClusterCallback) callback, (Integer) commandArguments.get(0),
+                  (Integer) commandArguments.get(1));
+        },
+        // DelegatedDefaultClusterCallback is not implemented in this file, but it's just a simpler DelegatedAttestationResponseCallback that passes an empty responseValues list.
+        () -> new DelegatedDefaultClusterCallback(),
+        commandParams
+    );
+    onOffClusterCommandInfo.put("OffWithEffect", offWithEffectCommandInfo);
+
+    // Populate cluster
+    ClusterInfo onOffClusterInfo = new ClusterInfo(
+        (ptr, endpointId) -> new OnOffCluster(ptr, endpointId), onOffClusterCommandInfo);
+
+    clusterMap.put("OnOff", onOffClusterInfo);
+    return clusterMap;
+  }
+
+
+  // APP CODE: Should be in the ClusterInteractionFragment instead of here.
+  static void accessClusterMap() {
+    Map<String, ClusterInfo> clusterMap = getClusterMap();
+    // In real code: get the device ptr using ChipClient.getConnectedDevicePointer
+    long devicePtr = 0L;
+    // This is hardcoded to 1 for most clusters
+    int endpointId = 1;
+    // In real code: "OnOff" would be selected by the user.
+    ClusterInfo clusterInfo = clusterMap.get("OnOff");
+    BaseChipCluster onOffCluster = clusterInfo.getCreateClusterFunction().create(devicePtr, endpointId);
+
+
+    // Imagine user wants to execute the command "OffWithEffect", pass the string here
+    CommandInfo offWithEffectInfo = clusterInfo.getCommands().get("OffWithEffect");
+    DelegatedClusterCallback callback = offWithEffectInfo.getCommandCallbackSupplier().get();
+
+    callback.setCallbackDelegate(new ClusterCommandCallback() {
+      @Override
+      public void onSuccess(List<Object> responseValues) {
+        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
+      }
+
+      @Override
+      public void onFailure(Exception exception) {
+        // Show some error.
+      }
+    });
+    offWithEffectInfo.getCommandParameters()
+    List<Object> commandArguments = new ArrayList<>();
+    // "effectId"
+    commandArguments.add(123);
+    // "effectVariant"
+    commandArguments.add(456);
+    // How do you know what callback to create?
+    offWithEffectInfo.getCommandFunction().invokeCommand(onOffCluster, null, commandArguments);
+  }
+}
\ No newline at end of file
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 495bc119df16ac..2c36e143a3934f 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -157,47 +157,84 @@ import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameter;
 import chip.clusterinfo.ParameterType;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.clusterinfo.ClusterCommandCallback;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 
 >>>>>>> a4fd0282e (no error code generation)
 
 public class ClusterInfoMapping {
 
+  class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+    @Override
+    public void onSuccess() {
+      List<Object> responseValues = new ArrayList<>();
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception e) {
+      callback.onFailure(e);
+    }
+  }
+
  public Map<String, ClusterInfo> getClusterMap() {
-     Map<String, ClusterInfo> clusterInfoMapping = new HashMap<>();
+     Map<String, ClusterInfo> clusterMap = new HashMap<>();
      {{#chip_client_clusters}}
-     ClusterInfo {{asLowerCamelCase name}}_clusterInfo = new ClusterInfo("{{asLowerCamelCase name}}");
+     Map<String, CommandInfo> {{asLowerCamelCase name}}_ClusterCommandInfo = new HashMap<>();
      {{#chip_cluster_commands}}
-           List<CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_parametersList = new ArrayList<>();
-           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo = new CommandInfo();
-           {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.name = "{{asLowerCamelCase name}}";
+           List<CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams = new ArrayList<>();
+           // TODO: fill out parameter types
            {{#if (zcl_command_arguments_count this.id)}}
                {{#if hasSpecificResponse}}
-                 {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class;
+
                {{else}}
-                 {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+
                {{/if}}
                {{#chip_cluster_command_arguments}}
                  CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_parametersList.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
+                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_commandParams.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
                  {{#not_last}} {{/not_last}}
                {{/chip_cluster_command_arguments}}
            {{else}}
              {{#if hasSpecificResponse}}
-               {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class;
+
              {{else}}
-               {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+
              {{/if}}
            {{/if}}
-           {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo.parameters = {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_parametersList;
-           {{asLowerCamelCase ../name}}_clusterInfo.commands.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandInfo);
+           // Populate commands
+           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                     // TODO: expose index in template helper
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams
+           );
+           {{asLowerCamelCase ../name}}_ClusterCommandInfo.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo);
      {{/chip_cluster_commands}}
-     clusterInfoMapping.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}_clusterInfo);
+     // Populate cluster
+     ClusterInfo {{asLowerCamelCase name}}_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}_ClusterCommandInfo);
+     clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}_clusterInfo);
      {{/chip_client_clusters}}
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
 =======
      return clusterInfoMapping;
 >>>>>>> a4fd0282e (no error code generation)
+=======
+     return clusterMap;
+>>>>>>> 2d2bbd2e1 (new design solution)
   }
 }
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index c671d3b69beab5..c533577d8172ad 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -19,6 +19,7 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import chip.clusterinfo.ClusterCommandCallback;
 import chip.clusterinfo.ClusterInfo;
@@ -7491,2632 +7492,3682 @@ public Map<String, ClusterInfo> getClusterMap() {
     clusterMap.put("windowCovering", windowCoveringClusterInfo);
     return clusterMap;
 =======
+=======
+import chip.clusterinfo.ClusterCommandCallback;
+>>>>>>> 2d2bbd2e1 (new design solution)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameter;
+import chip.clusterinfo.DelegatedClusterCallback;
+import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 import java.util.*;
 
 public class ClusterInfoMapping {
 
+  class DelegatedDefaultClusterCallback
+      implements DefaultClusterCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    // Parameters and list-adds here should be generated - refer to the template code that creates
+    // each callback interface.
+    @Override
+    public void onSuccess() {
+      List<Object> responseValues = new ArrayList<>();
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception e) {
+      callback.onFailure(e);
+    }
+  }
+
   public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterInfoMapping = new HashMap<>();
-    ClusterInfo accountLogin_clusterInfo = new ClusterInfo("accountLogin");
-    List<CommandParameter> accountLogin_getSetupPIN_parametersList = new ArrayList<>();
-    CommandInfo accountLogin_getSetupPIN_commandInfo = new CommandInfo();
-    accountLogin_getSetupPIN_commandInfo.name = "getSetupPIN";
-    accountLogin_getSetupPIN_commandInfo.callbackClass =
-        ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class;
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+    Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> accountLogin_getSetupPIN_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getSetupPIN_tempAccountIdentifier_commandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_getSetupPIN_parametersList.add(getSetupPIN_tempAccountIdentifier_commandParameter);
-
-    accountLogin_getSetupPIN_commandInfo.parameters = accountLogin_getSetupPIN_parametersList;
-    accountLogin_clusterInfo.commands.add(accountLogin_getSetupPIN_commandInfo);
-    List<CommandParameter> accountLogin_login_parametersList = new ArrayList<>();
-    CommandInfo accountLogin_login_commandInfo = new CommandInfo();
-    accountLogin_login_commandInfo.name = "login";
-    accountLogin_login_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    accountLogin_getSetupPIN_commandParams.add(getSetupPIN_tempAccountIdentifier_commandParameter);
+
+    // Populate commands
+    CommandInfo accountLogin_getSetupPIN_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLogin_getSetupPIN_commandParams);
+    accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
+    List<CommandParameter> accountLogin_login_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter login_tempAccountIdentifier_commandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_login_parametersList.add(login_tempAccountIdentifier_commandParameter);
+    accountLogin_login_commandParams.add(login_tempAccountIdentifier_commandParameter);
 
     CommandParameter login_setupPIN_commandParameter =
         new CommandParameter("setupPIN", String.class);
-    accountLogin_login_parametersList.add(login_setupPIN_commandParameter);
+    accountLogin_login_commandParams.add(login_setupPIN_commandParameter);
 
-    accountLogin_login_commandInfo.parameters = accountLogin_login_parametersList;
-    accountLogin_clusterInfo.commands.add(accountLogin_login_commandInfo);
-    clusterInfoMapping.put("accountLogin", accountLogin_clusterInfo);
-    ClusterInfo administratorCommissioning_clusterInfo =
-        new ClusterInfo("administratorCommissioning");
-    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_parametersList =
+    // Populate commands
+    CommandInfo accountLogin_login_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLogin_login_commandParams);
+    accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
+    // Populate cluster
+    ClusterInfo accountLogin_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
+            accountLogin_ClusterCommandInfo);
+    clusterMap.put("accountLogin", accountLogin_clusterInfo);
+    Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams =
         new ArrayList<>();
-    CommandInfo administratorCommissioning_openBasicCommissioningWindow_commandInfo =
-        new CommandInfo();
-    administratorCommissioning_openBasicCommissioningWindow_commandInfo.name =
-        "openBasicCommissioningWindow";
-    administratorCommissioning_openBasicCommissioningWindow_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter openBasicCommissioningWindow_commissioningTimeout_commandParameter =
         new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openBasicCommissioningWindow_parametersList.add(
+    administratorCommissioning_openBasicCommissioningWindow_commandParams.add(
         openBasicCommissioningWindow_commissioningTimeout_commandParameter);
 
-    administratorCommissioning_openBasicCommissioningWindow_commandInfo.parameters =
-        administratorCommissioning_openBasicCommissioningWindow_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(
-        administratorCommissioning_openBasicCommissioningWindow_commandInfo);
-    List<CommandParameter> administratorCommissioning_openCommissioningWindow_parametersList =
+    // Populate commands
+    CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_openBasicCommissioningWindow_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "openBasicCommissioningWindow",
+        administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
+    List<CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
         new ArrayList<>();
-    CommandInfo administratorCommissioning_openCommissioningWindow_commandInfo = new CommandInfo();
-    administratorCommissioning_openCommissioningWindow_commandInfo.name = "openCommissioningWindow";
-    administratorCommissioning_openCommissioningWindow_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter openCommissioningWindow_commissioningTimeout_commandParameter =
         new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_commissioningTimeout_commandParameter);
 
     CommandParameter openCommissioningWindow_PAKEVerifier_commandParameter =
         new CommandParameter("PAKEVerifier", byte[].class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_PAKEVerifier_commandParameter);
 
     CommandParameter openCommissioningWindow_discriminator_commandParameter =
         new CommandParameter("discriminator", int.class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_discriminator_commandParameter);
 
     CommandParameter openCommissioningWindow_iterations_commandParameter =
         new CommandParameter("iterations", long.class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_iterations_commandParameter);
 
     CommandParameter openCommissioningWindow_salt_commandParameter =
         new CommandParameter("salt", byte[].class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_salt_commandParameter);
 
     CommandParameter openCommissioningWindow_passcodeID_commandParameter =
         new CommandParameter("passcodeID", int.class);
-    administratorCommissioning_openCommissioningWindow_parametersList.add(
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
         openCommissioningWindow_passcodeID_commandParameter);
 
-    administratorCommissioning_openCommissioningWindow_commandInfo.parameters =
-        administratorCommissioning_openCommissioningWindow_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(
-        administratorCommissioning_openCommissioningWindow_commandInfo);
-    List<CommandParameter> administratorCommissioning_revokeCommissioning_parametersList =
+    // Populate commands
+    CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_openCommissioningWindow_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
+    List<CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
         new ArrayList<>();
-    CommandInfo administratorCommissioning_revokeCommissioning_commandInfo = new CommandInfo();
-    administratorCommissioning_revokeCommissioning_commandInfo.name = "revokeCommissioning";
-    administratorCommissioning_revokeCommissioning_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    administratorCommissioning_revokeCommissioning_commandInfo.parameters =
-        administratorCommissioning_revokeCommissioning_parametersList;
-    administratorCommissioning_clusterInfo.commands.add(
-        administratorCommissioning_revokeCommissioning_commandInfo);
-    clusterInfoMapping.put("administratorCommissioning", administratorCommissioning_clusterInfo);
-    ClusterInfo applicationBasic_clusterInfo = new ClusterInfo("applicationBasic");
-    List<CommandParameter> applicationBasic_changeStatus_parametersList = new ArrayList<>();
-    CommandInfo applicationBasic_changeStatus_commandInfo = new CommandInfo();
-    applicationBasic_changeStatus_commandInfo.name = "changeStatus";
-    applicationBasic_changeStatus_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_revokeCommissioning_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
+    // Populate cluster
+    ClusterInfo administratorCommissioning_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
+            administratorCommissioning_ClusterCommandInfo);
+    clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
+    Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> applicationBasic_changeStatus_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter changeStatus_status_commandParameter =
         new CommandParameter("status", int.class);
-    applicationBasic_changeStatus_parametersList.add(changeStatus_status_commandParameter);
-
-    applicationBasic_changeStatus_commandInfo.parameters =
-        applicationBasic_changeStatus_parametersList;
-    applicationBasic_clusterInfo.commands.add(applicationBasic_changeStatus_commandInfo);
-    clusterInfoMapping.put("applicationBasic", applicationBasic_clusterInfo);
-    ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo("applicationLauncher");
-    List<CommandParameter> applicationLauncher_launchApp_parametersList = new ArrayList<>();
-    CommandInfo applicationLauncher_launchApp_commandInfo = new CommandInfo();
-    applicationLauncher_launchApp_commandInfo.name = "launchApp";
-    applicationLauncher_launchApp_commandInfo.callbackClass =
-        ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class;
+    applicationBasic_changeStatus_commandParams.add(changeStatus_status_commandParameter);
+
+    // Populate commands
+    CommandInfo applicationBasic_changeStatus_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            applicationBasic_changeStatus_commandParams);
+    applicationBasic_ClusterCommandInfo.put(
+        "changeStatus", applicationBasic_changeStatus_CommandInfo);
+    // Populate cluster
+    ClusterInfo applicationBasic_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
+            applicationBasic_ClusterCommandInfo);
+    clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
+    Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> applicationLauncher_launchApp_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter launchApp_data_commandParameter = new CommandParameter("data", String.class);
-    applicationLauncher_launchApp_parametersList.add(launchApp_data_commandParameter);
+    applicationLauncher_launchApp_commandParams.add(launchApp_data_commandParameter);
 
     CommandParameter launchApp_catalogVendorId_commandParameter =
         new CommandParameter("catalogVendorId", int.class);
-    applicationLauncher_launchApp_parametersList.add(launchApp_catalogVendorId_commandParameter);
+    applicationLauncher_launchApp_commandParams.add(launchApp_catalogVendorId_commandParameter);
 
     CommandParameter launchApp_applicationId_commandParameter =
         new CommandParameter("applicationId", String.class);
-    applicationLauncher_launchApp_parametersList.add(launchApp_applicationId_commandParameter);
-
-    applicationLauncher_launchApp_commandInfo.parameters =
-        applicationLauncher_launchApp_parametersList;
-    applicationLauncher_clusterInfo.commands.add(applicationLauncher_launchApp_commandInfo);
-    clusterInfoMapping.put("applicationLauncher", applicationLauncher_clusterInfo);
-    ClusterInfo audioOutput_clusterInfo = new ClusterInfo("audioOutput");
-    List<CommandParameter> audioOutput_renameOutput_parametersList = new ArrayList<>();
-    CommandInfo audioOutput_renameOutput_commandInfo = new CommandInfo();
-    audioOutput_renameOutput_commandInfo.name = "renameOutput";
-    audioOutput_renameOutput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    applicationLauncher_launchApp_commandParams.add(launchApp_applicationId_commandParameter);
+
+    // Populate commands
+    CommandInfo applicationLauncher_launchApp_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            applicationLauncher_launchApp_commandParams);
+    applicationLauncher_ClusterCommandInfo.put(
+        "launchApp", applicationLauncher_launchApp_CommandInfo);
+    // Populate cluster
+    ClusterInfo applicationLauncher_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
+            applicationLauncher_ClusterCommandInfo);
+    clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
+    Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> audioOutput_renameOutput_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter renameOutput_index_commandParameter = new CommandParameter("index", int.class);
-    audioOutput_renameOutput_parametersList.add(renameOutput_index_commandParameter);
+    audioOutput_renameOutput_commandParams.add(renameOutput_index_commandParameter);
 
     CommandParameter renameOutput_name_commandParameter =
         new CommandParameter("name", String.class);
-    audioOutput_renameOutput_parametersList.add(renameOutput_name_commandParameter);
-
-    audioOutput_renameOutput_commandInfo.parameters = audioOutput_renameOutput_parametersList;
-    audioOutput_clusterInfo.commands.add(audioOutput_renameOutput_commandInfo);
-    List<CommandParameter> audioOutput_selectOutput_parametersList = new ArrayList<>();
-    CommandInfo audioOutput_selectOutput_commandInfo = new CommandInfo();
-    audioOutput_selectOutput_commandInfo.name = "selectOutput";
-    audioOutput_selectOutput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    audioOutput_renameOutput_commandParams.add(renameOutput_name_commandParameter);
+
+    // Populate commands
+    CommandInfo audioOutput_renameOutput_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            audioOutput_renameOutput_commandParams);
+    audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
+    List<CommandParameter> audioOutput_selectOutput_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter selectOutput_index_commandParameter = new CommandParameter("index", int.class);
-    audioOutput_selectOutput_parametersList.add(selectOutput_index_commandParameter);
+    audioOutput_selectOutput_commandParams.add(selectOutput_index_commandParameter);
 
-    audioOutput_selectOutput_commandInfo.parameters = audioOutput_selectOutput_parametersList;
-    audioOutput_clusterInfo.commands.add(audioOutput_selectOutput_commandInfo);
-    clusterInfoMapping.put("audioOutput", audioOutput_clusterInfo);
-    ClusterInfo barrierControl_clusterInfo = new ClusterInfo("barrierControl");
-    List<CommandParameter> barrierControl_barrierControlGoToPercent_parametersList =
+    // Populate commands
+    CommandInfo audioOutput_selectOutput_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            audioOutput_selectOutput_commandParams);
+    audioOutput_ClusterCommandInfo.put("selectOutput", audioOutput_selectOutput_CommandInfo);
+    // Populate cluster
+    ClusterInfo audioOutput_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
+            audioOutput_ClusterCommandInfo);
+    clusterMap.put("audioOutput", audioOutput_clusterInfo);
+    Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
         new ArrayList<>();
-    CommandInfo barrierControl_barrierControlGoToPercent_commandInfo = new CommandInfo();
-    barrierControl_barrierControlGoToPercent_commandInfo.name = "barrierControlGoToPercent";
-    barrierControl_barrierControlGoToPercent_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter barrierControlGoToPercent_percentOpen_commandParameter =
         new CommandParameter("percentOpen", int.class);
-    barrierControl_barrierControlGoToPercent_parametersList.add(
+    barrierControl_barrierControlGoToPercent_commandParams.add(
         barrierControlGoToPercent_percentOpen_commandParameter);
 
-    barrierControl_barrierControlGoToPercent_commandInfo.parameters =
-        barrierControl_barrierControlGoToPercent_parametersList;
-    barrierControl_clusterInfo.commands.add(barrierControl_barrierControlGoToPercent_commandInfo);
-    List<CommandParameter> barrierControl_barrierControlStop_parametersList = new ArrayList<>();
-    CommandInfo barrierControl_barrierControlStop_commandInfo = new CommandInfo();
-    barrierControl_barrierControlStop_commandInfo.name = "barrierControlStop";
-    barrierControl_barrierControlStop_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    barrierControl_barrierControlStop_commandInfo.parameters =
-        barrierControl_barrierControlStop_parametersList;
-    barrierControl_clusterInfo.commands.add(barrierControl_barrierControlStop_commandInfo);
-    clusterInfoMapping.put("barrierControl", barrierControl_clusterInfo);
-    ClusterInfo basic_clusterInfo = new ClusterInfo("basic");
-    List<CommandParameter> basic_mfgSpecificPing_parametersList = new ArrayList<>();
-    CommandInfo basic_mfgSpecificPing_commandInfo = new CommandInfo();
-    basic_mfgSpecificPing_commandInfo.name = "mfgSpecificPing";
-    basic_mfgSpecificPing_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    basic_mfgSpecificPing_commandInfo.parameters = basic_mfgSpecificPing_parametersList;
-    basic_clusterInfo.commands.add(basic_mfgSpecificPing_commandInfo);
-    clusterInfoMapping.put("basic", basic_clusterInfo);
-    ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo("binaryInputBasic");
-    clusterInfoMapping.put("binaryInputBasic", binaryInputBasic_clusterInfo);
-    ClusterInfo binding_clusterInfo = new ClusterInfo("binding");
-    List<CommandParameter> binding_bind_parametersList = new ArrayList<>();
-    CommandInfo binding_bind_commandInfo = new CommandInfo();
-    binding_bind_commandInfo.name = "bind";
-    binding_bind_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo barrierControl_barrierControlGoToPercent_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            barrierControl_barrierControlGoToPercent_commandParams);
+    barrierControl_ClusterCommandInfo.put(
+        "barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
+    List<CommandParameter> barrierControl_barrierControlStop_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo barrierControl_barrierControlStop_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            barrierControl_barrierControlStop_commandParams);
+    barrierControl_ClusterCommandInfo.put(
+        "barrierControlStop", barrierControl_barrierControlStop_CommandInfo);
+    // Populate cluster
+    ClusterInfo barrierControl_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
+            barrierControl_ClusterCommandInfo);
+    clusterMap.put("barrierControl", barrierControl_clusterInfo);
+    Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> basic_mfgSpecificPing_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo basic_mfgSpecificPing_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            basic_mfgSpecificPing_commandParams);
+    basic_ClusterCommandInfo.put("mfgSpecificPing", basic_mfgSpecificPing_CommandInfo);
+    // Populate cluster
+    ClusterInfo basic_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId),
+            basic_ClusterCommandInfo);
+    clusterMap.put("basic", basic_clusterInfo);
+    Map<String, CommandInfo> binaryInputBasic_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo binaryInputBasic_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId),
+            binaryInputBasic_ClusterCommandInfo);
+    clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
+    Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> binding_bind_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter bind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    binding_bind_parametersList.add(bind_nodeId_commandParameter);
+    binding_bind_commandParams.add(bind_nodeId_commandParameter);
 
     CommandParameter bind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    binding_bind_parametersList.add(bind_groupId_commandParameter);
+    binding_bind_commandParams.add(bind_groupId_commandParameter);
 
     CommandParameter bind_endpointId_commandParameter =
         new CommandParameter("endpointId", int.class);
-    binding_bind_parametersList.add(bind_endpointId_commandParameter);
+    binding_bind_commandParams.add(bind_endpointId_commandParameter);
 
     CommandParameter bind_clusterId_commandParameter =
         new CommandParameter("clusterId", long.class);
-    binding_bind_parametersList.add(bind_clusterId_commandParameter);
-
-    binding_bind_commandInfo.parameters = binding_bind_parametersList;
-    binding_clusterInfo.commands.add(binding_bind_commandInfo);
-    List<CommandParameter> binding_unbind_parametersList = new ArrayList<>();
-    CommandInfo binding_unbind_commandInfo = new CommandInfo();
-    binding_unbind_commandInfo.name = "unbind";
-    binding_unbind_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    binding_bind_commandParams.add(bind_clusterId_commandParameter);
+
+    // Populate commands
+    CommandInfo binding_bind_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            binding_bind_commandParams);
+    binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
+    List<CommandParameter> binding_unbind_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter unbind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    binding_unbind_parametersList.add(unbind_nodeId_commandParameter);
+    binding_unbind_commandParams.add(unbind_nodeId_commandParameter);
 
     CommandParameter unbind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    binding_unbind_parametersList.add(unbind_groupId_commandParameter);
+    binding_unbind_commandParams.add(unbind_groupId_commandParameter);
 
     CommandParameter unbind_endpointId_commandParameter =
         new CommandParameter("endpointId", int.class);
-    binding_unbind_parametersList.add(unbind_endpointId_commandParameter);
+    binding_unbind_commandParams.add(unbind_endpointId_commandParameter);
 
     CommandParameter unbind_clusterId_commandParameter =
         new CommandParameter("clusterId", long.class);
-    binding_unbind_parametersList.add(unbind_clusterId_commandParameter);
-
-    binding_unbind_commandInfo.parameters = binding_unbind_parametersList;
-    binding_clusterInfo.commands.add(binding_unbind_commandInfo);
-    clusterInfoMapping.put("binding", binding_clusterInfo);
-    ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo("bridgedDeviceBasic");
-    clusterInfoMapping.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
-    ClusterInfo colorControl_clusterInfo = new ClusterInfo("colorControl");
-    List<CommandParameter> colorControl_colorLoopSet_parametersList = new ArrayList<>();
-    CommandInfo colorControl_colorLoopSet_commandInfo = new CommandInfo();
-    colorControl_colorLoopSet_commandInfo.name = "colorLoopSet";
-    colorControl_colorLoopSet_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    binding_unbind_commandParams.add(unbind_clusterId_commandParameter);
+
+    // Populate commands
+    CommandInfo binding_unbind_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            binding_unbind_commandParams);
+    binding_ClusterCommandInfo.put("unbind", binding_unbind_CommandInfo);
+    // Populate cluster
+    ClusterInfo binding_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId),
+            binding_ClusterCommandInfo);
+    clusterMap.put("binding", binding_clusterInfo);
+    Map<String, CommandInfo> bridgedDeviceBasic_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo bridgedDeviceBasic_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
+            bridgedDeviceBasic_ClusterCommandInfo);
+    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
+    Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> colorControl_colorLoopSet_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter colorLoopSet_updateFlags_commandParameter =
         new CommandParameter("updateFlags", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_updateFlags_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_updateFlags_commandParameter);
 
     CommandParameter colorLoopSet_action_commandParameter =
         new CommandParameter("action", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_action_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_action_commandParameter);
 
     CommandParameter colorLoopSet_direction_commandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_direction_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_direction_commandParameter);
 
     CommandParameter colorLoopSet_time_commandParameter = new CommandParameter("time", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_time_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_time_commandParameter);
 
     CommandParameter colorLoopSet_startHue_commandParameter =
         new CommandParameter("startHue", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_startHue_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_startHue_commandParameter);
 
     CommandParameter colorLoopSet_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_optionsMask_commandParameter);
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_optionsMask_commandParameter);
 
     CommandParameter colorLoopSet_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_colorLoopSet_parametersList.add(colorLoopSet_optionsOverride_commandParameter);
-
-    colorControl_colorLoopSet_commandInfo.parameters = colorControl_colorLoopSet_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_colorLoopSet_commandInfo);
-    List<CommandParameter> colorControl_enhancedMoveHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_enhancedMoveHue_commandInfo = new CommandInfo();
-    colorControl_enhancedMoveHue_commandInfo.name = "enhancedMoveHue";
-    colorControl_enhancedMoveHue_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_colorLoopSet_commandParams.add(colorLoopSet_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_colorLoopSet_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_colorLoopSet_commandParams);
+    colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
+    List<CommandParameter> colorControl_enhancedMoveHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter enhancedMoveHue_moveMode_commandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_moveMode_commandParameter);
+    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_moveMode_commandParameter);
 
     CommandParameter enhancedMoveHue_rate_commandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_rate_commandParameter);
+    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_rate_commandParameter);
 
     CommandParameter enhancedMoveHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveHue_parametersList.add(enhancedMoveHue_optionsMask_commandParameter);
+    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_optionsMask_commandParameter);
 
     CommandParameter enhancedMoveHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveHue_parametersList.add(
+    colorControl_enhancedMoveHue_commandParams.add(
         enhancedMoveHue_optionsOverride_commandParameter);
 
-    colorControl_enhancedMoveHue_commandInfo.parameters =
-        colorControl_enhancedMoveHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveHue_commandInfo);
-    List<CommandParameter> colorControl_enhancedMoveToHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_enhancedMoveToHue_commandInfo = new CommandInfo();
-    colorControl_enhancedMoveToHue_commandInfo.name = "enhancedMoveToHue";
-    colorControl_enhancedMoveToHue_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_enhancedMoveHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_enhancedMoveHue_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
+    List<CommandParameter> colorControl_enhancedMoveToHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter enhancedMoveToHue_enhancedHue_commandParameter =
         new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHue_parametersList.add(
+    colorControl_enhancedMoveToHue_commandParams.add(
         enhancedMoveToHue_enhancedHue_commandParameter);
 
     CommandParameter enhancedMoveToHue_direction_commandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_enhancedMoveToHue_parametersList.add(enhancedMoveToHue_direction_commandParameter);
+    colorControl_enhancedMoveToHue_commandParams.add(enhancedMoveToHue_direction_commandParameter);
 
     CommandParameter enhancedMoveToHue_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHue_parametersList.add(
+    colorControl_enhancedMoveToHue_commandParams.add(
         enhancedMoveToHue_transitionTime_commandParameter);
 
     CommandParameter enhancedMoveToHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHue_parametersList.add(
+    colorControl_enhancedMoveToHue_commandParams.add(
         enhancedMoveToHue_optionsMask_commandParameter);
 
     CommandParameter enhancedMoveToHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveToHue_parametersList.add(
+    colorControl_enhancedMoveToHue_commandParams.add(
         enhancedMoveToHue_optionsOverride_commandParameter);
 
-    colorControl_enhancedMoveToHue_commandInfo.parameters =
-        colorControl_enhancedMoveToHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveToHue_commandInfo);
-    List<CommandParameter> colorControl_enhancedMoveToHueAndSaturation_parametersList =
+    // Populate commands
+    CommandInfo colorControl_enhancedMoveToHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_enhancedMoveToHue_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
+    List<CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
         new ArrayList<>();
-    CommandInfo colorControl_enhancedMoveToHueAndSaturation_commandInfo = new CommandInfo();
-    colorControl_enhancedMoveToHueAndSaturation_commandInfo.name = "enhancedMoveToHueAndSaturation";
-    colorControl_enhancedMoveToHueAndSaturation_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter enhancedMoveToHueAndSaturation_enhancedHue_commandParameter =
         new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
 
     CommandParameter enhancedMoveToHueAndSaturation_saturation_commandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_saturation_commandParameter);
 
     CommandParameter enhancedMoveToHueAndSaturation_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
 
     CommandParameter enhancedMoveToHueAndSaturation_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
 
     CommandParameter enhancedMoveToHueAndSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_parametersList.add(
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
 
-    colorControl_enhancedMoveToHueAndSaturation_commandInfo.parameters =
-        colorControl_enhancedMoveToHueAndSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_enhancedMoveToHueAndSaturation_commandInfo);
-    List<CommandParameter> colorControl_enhancedStepHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_enhancedStepHue_commandInfo = new CommandInfo();
-    colorControl_enhancedStepHue_commandInfo.name = "enhancedStepHue";
-    colorControl_enhancedStepHue_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_enhancedMoveToHueAndSaturation_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_enhancedMoveToHueAndSaturation_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
+    List<CommandParameter> colorControl_enhancedStepHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter enhancedStepHue_stepMode_commandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_stepMode_commandParameter);
+    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_stepMode_commandParameter);
 
     CommandParameter enhancedStepHue_stepSize_commandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_stepSize_commandParameter);
+    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_stepSize_commandParameter);
 
     CommandParameter enhancedStepHue_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedStepHue_parametersList.add(
-        enhancedStepHue_transitionTime_commandParameter);
+    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_transitionTime_commandParameter);
 
     CommandParameter enhancedStepHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedStepHue_parametersList.add(enhancedStepHue_optionsMask_commandParameter);
+    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_optionsMask_commandParameter);
 
     CommandParameter enhancedStepHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedStepHue_parametersList.add(
+    colorControl_enhancedStepHue_commandParams.add(
         enhancedStepHue_optionsOverride_commandParameter);
 
-    colorControl_enhancedStepHue_commandInfo.parameters =
-        colorControl_enhancedStepHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_enhancedStepHue_commandInfo);
-    List<CommandParameter> colorControl_moveColor_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveColor_commandInfo = new CommandInfo();
-    colorControl_moveColor_commandInfo.name = "moveColor";
-    colorControl_moveColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_enhancedStepHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_enhancedStepHue_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
+    List<CommandParameter> colorControl_moveColor_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveColor_rateX_commandParameter = new CommandParameter("rateX", int.class);
-    colorControl_moveColor_parametersList.add(moveColor_rateX_commandParameter);
+    colorControl_moveColor_commandParams.add(moveColor_rateX_commandParameter);
 
     CommandParameter moveColor_rateY_commandParameter = new CommandParameter("rateY", int.class);
-    colorControl_moveColor_parametersList.add(moveColor_rateY_commandParameter);
+    colorControl_moveColor_commandParams.add(moveColor_rateY_commandParameter);
 
     CommandParameter moveColor_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveColor_parametersList.add(moveColor_optionsMask_commandParameter);
+    colorControl_moveColor_commandParams.add(moveColor_optionsMask_commandParameter);
 
     CommandParameter moveColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveColor_parametersList.add(moveColor_optionsOverride_commandParameter);
-
-    colorControl_moveColor_commandInfo.parameters = colorControl_moveColor_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveColor_commandInfo);
-    List<CommandParameter> colorControl_moveColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveColorTemperature_commandInfo = new CommandInfo();
-    colorControl_moveColorTemperature_commandInfo.name = "moveColorTemperature";
-    colorControl_moveColorTemperature_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_moveColor_commandParams.add(moveColor_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_moveColor_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveColor_commandParams);
+    colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
+    List<CommandParameter> colorControl_moveColorTemperature_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveColorTemperature_moveMode_commandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
+    colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_moveMode_commandParameter);
 
     CommandParameter moveColorTemperature_rate_commandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
-        moveColorTemperature_rate_commandParameter);
+    colorControl_moveColorTemperature_commandParams.add(moveColorTemperature_rate_commandParameter);
 
     CommandParameter moveColorTemperature_colorTemperatureMinimum_commandParameter =
         new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
+    colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_colorTemperatureMinimum_commandParameter);
 
     CommandParameter moveColorTemperature_colorTemperatureMaximum_commandParameter =
         new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
+    colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_colorTemperatureMaximum_commandParameter);
 
     CommandParameter moveColorTemperature_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
+    colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_optionsMask_commandParameter);
 
     CommandParameter moveColorTemperature_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveColorTemperature_parametersList.add(
+    colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_optionsOverride_commandParameter);
 
-    colorControl_moveColorTemperature_commandInfo.parameters =
-        colorControl_moveColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveColorTemperature_commandInfo);
-    List<CommandParameter> colorControl_moveHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveHue_commandInfo = new CommandInfo();
-    colorControl_moveHue_commandInfo.name = "moveHue";
-    colorControl_moveHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_moveColorTemperature_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveColorTemperature_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
+    List<CommandParameter> colorControl_moveHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveHue_moveMode_commandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveHue_parametersList.add(moveHue_moveMode_commandParameter);
+    colorControl_moveHue_commandParams.add(moveHue_moveMode_commandParameter);
 
     CommandParameter moveHue_rate_commandParameter = new CommandParameter("rate", int.class);
-    colorControl_moveHue_parametersList.add(moveHue_rate_commandParameter);
+    colorControl_moveHue_commandParams.add(moveHue_rate_commandParameter);
 
     CommandParameter moveHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveHue_parametersList.add(moveHue_optionsMask_commandParameter);
+    colorControl_moveHue_commandParams.add(moveHue_optionsMask_commandParameter);
 
     CommandParameter moveHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveHue_parametersList.add(moveHue_optionsOverride_commandParameter);
-
-    colorControl_moveHue_commandInfo.parameters = colorControl_moveHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveHue_commandInfo);
-    List<CommandParameter> colorControl_moveSaturation_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveSaturation_commandInfo = new CommandInfo();
-    colorControl_moveSaturation_commandInfo.name = "moveSaturation";
-    colorControl_moveSaturation_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_moveHue_commandParams.add(moveHue_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_moveHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveHue_commandParams);
+    colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
+    List<CommandParameter> colorControl_moveSaturation_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveSaturation_moveMode_commandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveSaturation_parametersList.add(moveSaturation_moveMode_commandParameter);
+    colorControl_moveSaturation_commandParams.add(moveSaturation_moveMode_commandParameter);
 
     CommandParameter moveSaturation_rate_commandParameter = new CommandParameter("rate", int.class);
-    colorControl_moveSaturation_parametersList.add(moveSaturation_rate_commandParameter);
+    colorControl_moveSaturation_commandParams.add(moveSaturation_rate_commandParameter);
 
     CommandParameter moveSaturation_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveSaturation_parametersList.add(moveSaturation_optionsMask_commandParameter);
+    colorControl_moveSaturation_commandParams.add(moveSaturation_optionsMask_commandParameter);
 
     CommandParameter moveSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveSaturation_parametersList.add(moveSaturation_optionsOverride_commandParameter);
-
-    colorControl_moveSaturation_commandInfo.parameters = colorControl_moveSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveSaturation_commandInfo);
-    List<CommandParameter> colorControl_moveToColor_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveToColor_commandInfo = new CommandInfo();
-    colorControl_moveToColor_commandInfo.name = "moveToColor";
-    colorControl_moveToColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    colorControl_moveSaturation_commandParams.add(moveSaturation_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_moveSaturation_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveSaturation_commandParams);
+    colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
+    List<CommandParameter> colorControl_moveToColor_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToColor_colorX_commandParameter =
         new CommandParameter("colorX", int.class);
-    colorControl_moveToColor_parametersList.add(moveToColor_colorX_commandParameter);
+    colorControl_moveToColor_commandParams.add(moveToColor_colorX_commandParameter);
 
     CommandParameter moveToColor_colorY_commandParameter =
         new CommandParameter("colorY", int.class);
-    colorControl_moveToColor_parametersList.add(moveToColor_colorY_commandParameter);
+    colorControl_moveToColor_commandParams.add(moveToColor_colorY_commandParameter);
 
     CommandParameter moveToColor_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColor_parametersList.add(moveToColor_transitionTime_commandParameter);
+    colorControl_moveToColor_commandParams.add(moveToColor_transitionTime_commandParameter);
 
     CommandParameter moveToColor_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColor_parametersList.add(moveToColor_optionsMask_commandParameter);
+    colorControl_moveToColor_commandParams.add(moveToColor_optionsMask_commandParameter);
 
     CommandParameter moveToColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToColor_parametersList.add(moveToColor_optionsOverride_commandParameter);
-
-    colorControl_moveToColor_commandInfo.parameters = colorControl_moveToColor_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveToColor_commandInfo);
-    List<CommandParameter> colorControl_moveToColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveToColorTemperature_commandInfo = new CommandInfo();
-    colorControl_moveToColorTemperature_commandInfo.name = "moveToColorTemperature";
-    colorControl_moveToColorTemperature_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_moveToColor_commandParams.add(moveToColor_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_moveToColor_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveToColor_commandParams);
+    colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
+    List<CommandParameter> colorControl_moveToColorTemperature_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToColorTemperature_colorTemperature_commandParameter =
         new CommandParameter("colorTemperature", int.class);
-    colorControl_moveToColorTemperature_parametersList.add(
+    colorControl_moveToColorTemperature_commandParams.add(
         moveToColorTemperature_colorTemperature_commandParameter);
 
     CommandParameter moveToColorTemperature_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColorTemperature_parametersList.add(
+    colorControl_moveToColorTemperature_commandParams.add(
         moveToColorTemperature_transitionTime_commandParameter);
 
     CommandParameter moveToColorTemperature_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColorTemperature_parametersList.add(
+    colorControl_moveToColorTemperature_commandParams.add(
         moveToColorTemperature_optionsMask_commandParameter);
 
     CommandParameter moveToColorTemperature_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToColorTemperature_parametersList.add(
+    colorControl_moveToColorTemperature_commandParams.add(
         moveToColorTemperature_optionsOverride_commandParameter);
 
-    colorControl_moveToColorTemperature_commandInfo.parameters =
-        colorControl_moveToColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveToColorTemperature_commandInfo);
-    List<CommandParameter> colorControl_moveToHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveToHue_commandInfo = new CommandInfo();
-    colorControl_moveToHue_commandInfo.name = "moveToHue";
-    colorControl_moveToHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_moveToColorTemperature_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveToColorTemperature_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
+    List<CommandParameter> colorControl_moveToHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToHue_hue_commandParameter = new CommandParameter("hue", int.class);
-    colorControl_moveToHue_parametersList.add(moveToHue_hue_commandParameter);
+    colorControl_moveToHue_commandParams.add(moveToHue_hue_commandParameter);
 
     CommandParameter moveToHue_direction_commandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_moveToHue_parametersList.add(moveToHue_direction_commandParameter);
+    colorControl_moveToHue_commandParams.add(moveToHue_direction_commandParameter);
 
     CommandParameter moveToHue_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHue_parametersList.add(moveToHue_transitionTime_commandParameter);
+    colorControl_moveToHue_commandParams.add(moveToHue_transitionTime_commandParameter);
 
     CommandParameter moveToHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHue_parametersList.add(moveToHue_optionsMask_commandParameter);
+    colorControl_moveToHue_commandParams.add(moveToHue_optionsMask_commandParameter);
 
     CommandParameter moveToHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToHue_parametersList.add(moveToHue_optionsOverride_commandParameter);
-
-    colorControl_moveToHue_commandInfo.parameters = colorControl_moveToHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveToHue_commandInfo);
-    List<CommandParameter> colorControl_moveToHueAndSaturation_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveToHueAndSaturation_commandInfo = new CommandInfo();
-    colorControl_moveToHueAndSaturation_commandInfo.name = "moveToHueAndSaturation";
-    colorControl_moveToHueAndSaturation_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_moveToHue_commandParams.add(moveToHue_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_moveToHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveToHue_commandParams);
+    colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
+    List<CommandParameter> colorControl_moveToHueAndSaturation_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToHueAndSaturation_hue_commandParameter =
         new CommandParameter("hue", int.class);
-    colorControl_moveToHueAndSaturation_parametersList.add(
+    colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_hue_commandParameter);
 
     CommandParameter moveToHueAndSaturation_saturation_commandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_moveToHueAndSaturation_parametersList.add(
+    colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_saturation_commandParameter);
 
     CommandParameter moveToHueAndSaturation_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHueAndSaturation_parametersList.add(
+    colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_transitionTime_commandParameter);
 
     CommandParameter moveToHueAndSaturation_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHueAndSaturation_parametersList.add(
+    colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_optionsMask_commandParameter);
 
     CommandParameter moveToHueAndSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToHueAndSaturation_parametersList.add(
+    colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_optionsOverride_commandParameter);
 
-    colorControl_moveToHueAndSaturation_commandInfo.parameters =
-        colorControl_moveToHueAndSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveToHueAndSaturation_commandInfo);
-    List<CommandParameter> colorControl_moveToSaturation_parametersList = new ArrayList<>();
-    CommandInfo colorControl_moveToSaturation_commandInfo = new CommandInfo();
-    colorControl_moveToSaturation_commandInfo.name = "moveToSaturation";
-    colorControl_moveToSaturation_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_moveToHueAndSaturation_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveToHueAndSaturation_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
+    List<CommandParameter> colorControl_moveToSaturation_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToSaturation_saturation_commandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_moveToSaturation_parametersList.add(moveToSaturation_saturation_commandParameter);
+    colorControl_moveToSaturation_commandParams.add(moveToSaturation_saturation_commandParameter);
 
     CommandParameter moveToSaturation_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToSaturation_parametersList.add(
+    colorControl_moveToSaturation_commandParams.add(
         moveToSaturation_transitionTime_commandParameter);
 
     CommandParameter moveToSaturation_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToSaturation_parametersList.add(moveToSaturation_optionsMask_commandParameter);
+    colorControl_moveToSaturation_commandParams.add(moveToSaturation_optionsMask_commandParameter);
 
     CommandParameter moveToSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToSaturation_parametersList.add(
+    colorControl_moveToSaturation_commandParams.add(
         moveToSaturation_optionsOverride_commandParameter);
 
-    colorControl_moveToSaturation_commandInfo.parameters =
-        colorControl_moveToSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_moveToSaturation_commandInfo);
-    List<CommandParameter> colorControl_stepColor_parametersList = new ArrayList<>();
-    CommandInfo colorControl_stepColor_commandInfo = new CommandInfo();
-    colorControl_stepColor_commandInfo.name = "stepColor";
-    colorControl_stepColor_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo colorControl_moveToSaturation_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_moveToSaturation_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "moveToSaturation", colorControl_moveToSaturation_CommandInfo);
+    List<CommandParameter> colorControl_stepColor_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stepColor_stepX_commandParameter = new CommandParameter("stepX", int.class);
-    colorControl_stepColor_parametersList.add(stepColor_stepX_commandParameter);
+    colorControl_stepColor_commandParams.add(stepColor_stepX_commandParameter);
 
     CommandParameter stepColor_stepY_commandParameter = new CommandParameter("stepY", int.class);
-    colorControl_stepColor_parametersList.add(stepColor_stepY_commandParameter);
+    colorControl_stepColor_commandParams.add(stepColor_stepY_commandParameter);
 
     CommandParameter stepColor_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepColor_parametersList.add(stepColor_transitionTime_commandParameter);
+    colorControl_stepColor_commandParams.add(stepColor_transitionTime_commandParameter);
 
     CommandParameter stepColor_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepColor_parametersList.add(stepColor_optionsMask_commandParameter);
+    colorControl_stepColor_commandParams.add(stepColor_optionsMask_commandParameter);
 
     CommandParameter stepColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_stepColor_parametersList.add(stepColor_optionsOverride_commandParameter);
-
-    colorControl_stepColor_commandInfo.parameters = colorControl_stepColor_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_stepColor_commandInfo);
-    List<CommandParameter> colorControl_stepColorTemperature_parametersList = new ArrayList<>();
-    CommandInfo colorControl_stepColorTemperature_commandInfo = new CommandInfo();
-    colorControl_stepColorTemperature_commandInfo.name = "stepColorTemperature";
-    colorControl_stepColorTemperature_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_stepColor_commandParams.add(stepColor_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_stepColor_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_stepColor_commandParams);
+    colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
+    List<CommandParameter> colorControl_stepColorTemperature_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stepColorTemperature_stepMode_commandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_stepMode_commandParameter);
 
     CommandParameter stepColorTemperature_stepSize_commandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_stepSize_commandParameter);
 
     CommandParameter stepColorTemperature_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_transitionTime_commandParameter);
 
     CommandParameter stepColorTemperature_colorTemperatureMinimum_commandParameter =
         new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_colorTemperatureMinimum_commandParameter);
 
     CommandParameter stepColorTemperature_colorTemperatureMaximum_commandParameter =
         new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_colorTemperatureMaximum_commandParameter);
 
     CommandParameter stepColorTemperature_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_optionsMask_commandParameter);
 
     CommandParameter stepColorTemperature_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_stepColorTemperature_parametersList.add(
+    colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_optionsOverride_commandParameter);
 
-    colorControl_stepColorTemperature_commandInfo.parameters =
-        colorControl_stepColorTemperature_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_stepColorTemperature_commandInfo);
-    List<CommandParameter> colorControl_stepHue_parametersList = new ArrayList<>();
-    CommandInfo colorControl_stepHue_commandInfo = new CommandInfo();
-    colorControl_stepHue_commandInfo.name = "stepHue";
-    colorControl_stepHue_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    CommandParameter stepHue_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControl_stepHue_parametersList.add(stepHue_stepMode_commandParameter);
-
-    CommandParameter stepHue_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControl_stepHue_parametersList.add(stepHue_stepSize_commandParameter);
+    // Populate commands
+    CommandInfo colorControl_stepColorTemperature_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_stepColorTemperature_commandParams);
+    colorControl_ClusterCommandInfo.put(
+        "stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
+    List<CommandParameter> colorControl_stepHue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter stepHue_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepHue_commandParams.add(stepHue_stepMode_commandParameter);
+
+    CommandParameter stepHue_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepHue_commandParams.add(stepHue_stepSize_commandParameter);
 
     CommandParameter stepHue_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepHue_parametersList.add(stepHue_transitionTime_commandParameter);
+    colorControl_stepHue_commandParams.add(stepHue_transitionTime_commandParameter);
 
     CommandParameter stepHue_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepHue_parametersList.add(stepHue_optionsMask_commandParameter);
+    colorControl_stepHue_commandParams.add(stepHue_optionsMask_commandParameter);
 
     CommandParameter stepHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_stepHue_parametersList.add(stepHue_optionsOverride_commandParameter);
-
-    colorControl_stepHue_commandInfo.parameters = colorControl_stepHue_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_stepHue_commandInfo);
-    List<CommandParameter> colorControl_stepSaturation_parametersList = new ArrayList<>();
-    CommandInfo colorControl_stepSaturation_commandInfo = new CommandInfo();
-    colorControl_stepSaturation_commandInfo.name = "stepSaturation";
-    colorControl_stepSaturation_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    colorControl_stepHue_commandParams.add(stepHue_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_stepHue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_stepHue_commandParams);
+    colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
+    List<CommandParameter> colorControl_stepSaturation_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stepSaturation_stepMode_commandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_stepSaturation_parametersList.add(stepSaturation_stepMode_commandParameter);
+    colorControl_stepSaturation_commandParams.add(stepSaturation_stepMode_commandParameter);
 
     CommandParameter stepSaturation_stepSize_commandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_stepSaturation_parametersList.add(stepSaturation_stepSize_commandParameter);
+    colorControl_stepSaturation_commandParams.add(stepSaturation_stepSize_commandParameter);
 
     CommandParameter stepSaturation_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepSaturation_parametersList.add(stepSaturation_transitionTime_commandParameter);
+    colorControl_stepSaturation_commandParams.add(stepSaturation_transitionTime_commandParameter);
 
     CommandParameter stepSaturation_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepSaturation_parametersList.add(stepSaturation_optionsMask_commandParameter);
+    colorControl_stepSaturation_commandParams.add(stepSaturation_optionsMask_commandParameter);
 
     CommandParameter stepSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_stepSaturation_parametersList.add(stepSaturation_optionsOverride_commandParameter);
-
-    colorControl_stepSaturation_commandInfo.parameters = colorControl_stepSaturation_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_stepSaturation_commandInfo);
-    List<CommandParameter> colorControl_stopMoveStep_parametersList = new ArrayList<>();
-    CommandInfo colorControl_stopMoveStep_commandInfo = new CommandInfo();
-    colorControl_stopMoveStep_commandInfo.name = "stopMoveStep";
-    colorControl_stopMoveStep_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    colorControl_stepSaturation_commandParams.add(stepSaturation_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_stepSaturation_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_stepSaturation_commandParams);
+    colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
+    List<CommandParameter> colorControl_stopMoveStep_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stopMoveStep_optionsMask_commandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stopMoveStep_parametersList.add(stopMoveStep_optionsMask_commandParameter);
+    colorControl_stopMoveStep_commandParams.add(stopMoveStep_optionsMask_commandParameter);
 
     CommandParameter stopMoveStep_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_stopMoveStep_parametersList.add(stopMoveStep_optionsOverride_commandParameter);
-
-    colorControl_stopMoveStep_commandInfo.parameters = colorControl_stopMoveStep_parametersList;
-    colorControl_clusterInfo.commands.add(colorControl_stopMoveStep_commandInfo);
-    clusterInfoMapping.put("colorControl", colorControl_clusterInfo);
-    ClusterInfo contentLauncher_clusterInfo = new ClusterInfo("contentLauncher");
-    List<CommandParameter> contentLauncher_launchContent_parametersList = new ArrayList<>();
-    CommandInfo contentLauncher_launchContent_commandInfo = new CommandInfo();
-    contentLauncher_launchContent_commandInfo.name = "launchContent";
-    contentLauncher_launchContent_commandInfo.callbackClass =
-        ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class;
+    colorControl_stopMoveStep_commandParams.add(stopMoveStep_optionsOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo colorControl_stopMoveStep_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            colorControl_stopMoveStep_commandParams);
+    colorControl_ClusterCommandInfo.put("stopMoveStep", colorControl_stopMoveStep_CommandInfo);
+    // Populate cluster
+    ClusterInfo colorControl_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
+            colorControl_ClusterCommandInfo);
+    clusterMap.put("colorControl", colorControl_clusterInfo);
+    Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> contentLauncher_launchContent_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter launchContent_autoPlay_commandParameter =
         new CommandParameter("autoPlay", boolean.class);
-    contentLauncher_launchContent_parametersList.add(launchContent_autoPlay_commandParameter);
+    contentLauncher_launchContent_commandParams.add(launchContent_autoPlay_commandParameter);
 
     CommandParameter launchContent_data_commandParameter =
         new CommandParameter("data", String.class);
-    contentLauncher_launchContent_parametersList.add(launchContent_data_commandParameter);
-
-    contentLauncher_launchContent_commandInfo.parameters =
-        contentLauncher_launchContent_parametersList;
-    contentLauncher_clusterInfo.commands.add(contentLauncher_launchContent_commandInfo);
-    List<CommandParameter> contentLauncher_launchURL_parametersList = new ArrayList<>();
-    CommandInfo contentLauncher_launchURL_commandInfo = new CommandInfo();
-    contentLauncher_launchURL_commandInfo.name = "launchURL";
-    contentLauncher_launchURL_commandInfo.callbackClass =
-        ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class;
+    contentLauncher_launchContent_commandParams.add(launchContent_data_commandParameter);
+
+    // Populate commands
+    CommandInfo contentLauncher_launchContent_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            contentLauncher_launchContent_commandParams);
+    contentLauncher_ClusterCommandInfo.put(
+        "launchContent", contentLauncher_launchContent_CommandInfo);
+    List<CommandParameter> contentLauncher_launchURL_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter launchURL_contentURL_commandParameter =
         new CommandParameter("contentURL", String.class);
-    contentLauncher_launchURL_parametersList.add(launchURL_contentURL_commandParameter);
+    contentLauncher_launchURL_commandParams.add(launchURL_contentURL_commandParameter);
 
     CommandParameter launchURL_displayString_commandParameter =
         new CommandParameter("displayString", String.class);
-    contentLauncher_launchURL_parametersList.add(launchURL_displayString_commandParameter);
-
-    contentLauncher_launchURL_commandInfo.parameters = contentLauncher_launchURL_parametersList;
-    contentLauncher_clusterInfo.commands.add(contentLauncher_launchURL_commandInfo);
-    clusterInfoMapping.put("contentLauncher", contentLauncher_clusterInfo);
-    ClusterInfo descriptor_clusterInfo = new ClusterInfo("descriptor");
-    clusterInfoMapping.put("descriptor", descriptor_clusterInfo);
-    ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo("diagnosticLogs");
-    List<CommandParameter> diagnosticLogs_retrieveLogsRequest_parametersList = new ArrayList<>();
-    CommandInfo diagnosticLogs_retrieveLogsRequest_commandInfo = new CommandInfo();
-    diagnosticLogs_retrieveLogsRequest_commandInfo.name = "retrieveLogsRequest";
-    diagnosticLogs_retrieveLogsRequest_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    contentLauncher_launchURL_commandParams.add(launchURL_displayString_commandParameter);
+
+    // Populate commands
+    CommandInfo contentLauncher_launchURL_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            contentLauncher_launchURL_commandParams);
+    contentLauncher_ClusterCommandInfo.put("launchURL", contentLauncher_launchURL_CommandInfo);
+    // Populate cluster
+    ClusterInfo contentLauncher_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
+            contentLauncher_ClusterCommandInfo);
+    clusterMap.put("contentLauncher", contentLauncher_clusterInfo);
+    Map<String, CommandInfo> descriptor_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo descriptor_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
+            descriptor_ClusterCommandInfo);
+    clusterMap.put("descriptor", descriptor_clusterInfo);
+    Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter retrieveLogsRequest_intent_commandParameter =
         new CommandParameter("intent", int.class);
-    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+    diagnosticLogs_retrieveLogsRequest_commandParams.add(
         retrieveLogsRequest_intent_commandParameter);
 
     CommandParameter retrieveLogsRequest_requestedProtocol_commandParameter =
         new CommandParameter("requestedProtocol", int.class);
-    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+    diagnosticLogs_retrieveLogsRequest_commandParams.add(
         retrieveLogsRequest_requestedProtocol_commandParameter);
 
     CommandParameter retrieveLogsRequest_transferFileDesignator_commandParameter =
         new CommandParameter("transferFileDesignator", byte[].class);
-    diagnosticLogs_retrieveLogsRequest_parametersList.add(
+    diagnosticLogs_retrieveLogsRequest_commandParams.add(
         retrieveLogsRequest_transferFileDesignator_commandParameter);
 
-    diagnosticLogs_retrieveLogsRequest_commandInfo.parameters =
-        diagnosticLogs_retrieveLogsRequest_parametersList;
-    diagnosticLogs_clusterInfo.commands.add(diagnosticLogs_retrieveLogsRequest_commandInfo);
-    clusterInfoMapping.put("diagnosticLogs", diagnosticLogs_clusterInfo);
-    ClusterInfo doorLock_clusterInfo = new ClusterInfo("doorLock");
-    List<CommandParameter> doorLock_clearAllPins_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearAllPins_commandInfo = new CommandInfo();
-    doorLock_clearAllPins_commandInfo.name = "clearAllPins";
-    doorLock_clearAllPins_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class;
-    doorLock_clearAllPins_commandInfo.parameters = doorLock_clearAllPins_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearAllPins_commandInfo);
-    List<CommandParameter> doorLock_clearAllRfids_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearAllRfids_commandInfo = new CommandInfo();
-    doorLock_clearAllRfids_commandInfo.name = "clearAllRfids";
-    doorLock_clearAllRfids_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class;
-    doorLock_clearAllRfids_commandInfo.parameters = doorLock_clearAllRfids_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearAllRfids_commandInfo);
-    List<CommandParameter> doorLock_clearHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearHolidaySchedule_commandInfo = new CommandInfo();
-    doorLock_clearHolidaySchedule_commandInfo.name = "clearHolidaySchedule";
-    doorLock_clearHolidaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class;
+    // Populate commands
+    CommandInfo diagnosticLogs_retrieveLogsRequest_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            diagnosticLogs_retrieveLogsRequest_commandParams);
+    diagnosticLogs_ClusterCommandInfo.put(
+        "retrieveLogsRequest", diagnosticLogs_retrieveLogsRequest_CommandInfo);
+    // Populate cluster
+    ClusterInfo diagnosticLogs_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId),
+            diagnosticLogs_ClusterCommandInfo);
+    clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
+    Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> doorLock_clearAllPins_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo doorLock_clearAllPins_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearAllPins_commandParams);
+    doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
+    List<CommandParameter> doorLock_clearAllRfids_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo doorLock_clearAllRfids_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearAllRfids_commandParams);
+    doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
+    List<CommandParameter> doorLock_clearHolidaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter clearHolidaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_clearHolidaySchedule_parametersList.add(
+    doorLock_clearHolidaySchedule_commandParams.add(
         clearHolidaySchedule_scheduleId_commandParameter);
 
-    doorLock_clearHolidaySchedule_commandInfo.parameters =
-        doorLock_clearHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearHolidaySchedule_commandInfo);
-    List<CommandParameter> doorLock_clearPin_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearPin_commandInfo = new CommandInfo();
-    doorLock_clearPin_commandInfo.name = "clearPin";
-    doorLock_clearPin_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearPinResponseCallback.class;
+    // Populate commands
+    CommandInfo doorLock_clearHolidaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearHolidaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put(
+        "clearHolidaySchedule", doorLock_clearHolidaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_clearPin_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_clearPin_parametersList.add(clearPin_userId_commandParameter);
-
-    doorLock_clearPin_commandInfo.parameters = doorLock_clearPin_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearPin_commandInfo);
-    List<CommandParameter> doorLock_clearRfid_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearRfid_commandInfo = new CommandInfo();
-    doorLock_clearRfid_commandInfo.name = "clearRfid";
-    doorLock_clearRfid_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class;
+    doorLock_clearPin_commandParams.add(clearPin_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_clearPin_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearPin_commandParams);
+    doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
+    List<CommandParameter> doorLock_clearRfid_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_clearRfid_parametersList.add(clearRfid_userId_commandParameter);
-
-    doorLock_clearRfid_commandInfo.parameters = doorLock_clearRfid_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearRfid_commandInfo);
-    List<CommandParameter> doorLock_clearWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearWeekdaySchedule_commandInfo = new CommandInfo();
-    doorLock_clearWeekdaySchedule_commandInfo.name = "clearWeekdaySchedule";
-    doorLock_clearWeekdaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class;
+    doorLock_clearRfid_commandParams.add(clearRfid_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_clearRfid_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearRfid_commandParams);
+    doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
+    List<CommandParameter> doorLock_clearWeekdaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter clearWeekdaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_clearWeekdaySchedule_parametersList.add(
+    doorLock_clearWeekdaySchedule_commandParams.add(
         clearWeekdaySchedule_scheduleId_commandParameter);
 
     CommandParameter clearWeekdaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_clearWeekdaySchedule_parametersList.add(clearWeekdaySchedule_userId_commandParameter);
-
-    doorLock_clearWeekdaySchedule_commandInfo.parameters =
-        doorLock_clearWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearWeekdaySchedule_commandInfo);
-    List<CommandParameter> doorLock_clearYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_clearYeardaySchedule_commandInfo = new CommandInfo();
-    doorLock_clearYeardaySchedule_commandInfo.name = "clearYeardaySchedule";
-    doorLock_clearYeardaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class;
+    doorLock_clearWeekdaySchedule_commandParams.add(clearWeekdaySchedule_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_clearWeekdaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearWeekdaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put(
+        "clearWeekdaySchedule", doorLock_clearWeekdaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_clearYeardaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter clearYeardaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_clearYeardaySchedule_parametersList.add(
+    doorLock_clearYeardaySchedule_commandParams.add(
         clearYeardaySchedule_scheduleId_commandParameter);
 
     CommandParameter clearYeardaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_clearYeardaySchedule_parametersList.add(clearYeardaySchedule_userId_commandParameter);
-
-    doorLock_clearYeardaySchedule_commandInfo.parameters =
-        doorLock_clearYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_clearYeardaySchedule_commandInfo);
-    List<CommandParameter> doorLock_getHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getHolidaySchedule_commandInfo = new CommandInfo();
-    doorLock_getHolidaySchedule_commandInfo.name = "getHolidaySchedule";
-    doorLock_getHolidaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class;
+    doorLock_clearYeardaySchedule_commandParams.add(clearYeardaySchedule_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_clearYeardaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_clearYeardaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put(
+        "clearYeardaySchedule", doorLock_clearYeardaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_getHolidaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getHolidaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_getHolidaySchedule_parametersList.add(getHolidaySchedule_scheduleId_commandParameter);
-
-    doorLock_getHolidaySchedule_commandInfo.parameters = doorLock_getHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getHolidaySchedule_commandInfo);
-    List<CommandParameter> doorLock_getLogRecord_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getLogRecord_commandInfo = new CommandInfo();
-    doorLock_getLogRecord_commandInfo.name = "getLogRecord";
-    doorLock_getLogRecord_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class;
+    doorLock_getHolidaySchedule_commandParams.add(getHolidaySchedule_scheduleId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getHolidaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getHolidaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_getLogRecord_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getLogRecord_logIndex_commandParameter =
         new CommandParameter("logIndex", int.class);
-    doorLock_getLogRecord_parametersList.add(getLogRecord_logIndex_commandParameter);
-
-    doorLock_getLogRecord_commandInfo.parameters = doorLock_getLogRecord_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getLogRecord_commandInfo);
-    List<CommandParameter> doorLock_getPin_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getPin_commandInfo = new CommandInfo();
-    doorLock_getPin_commandInfo.name = "getPin";
-    doorLock_getPin_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetPinResponseCallback.class;
+    doorLock_getLogRecord_commandParams.add(getLogRecord_logIndex_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getLogRecord_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getLogRecord_commandParams);
+    doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
+    List<CommandParameter> doorLock_getPin_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_getPin_parametersList.add(getPin_userId_commandParameter);
-
-    doorLock_getPin_commandInfo.parameters = doorLock_getPin_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getPin_commandInfo);
-    List<CommandParameter> doorLock_getRfid_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getRfid_commandInfo = new CommandInfo();
-    doorLock_getRfid_commandInfo.name = "getRfid";
-    doorLock_getRfid_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetRfidResponseCallback.class;
+    doorLock_getPin_commandParams.add(getPin_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getPin_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getPin_commandParams);
+    doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
+    List<CommandParameter> doorLock_getRfid_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_getRfid_parametersList.add(getRfid_userId_commandParameter);
-
-    doorLock_getRfid_commandInfo.parameters = doorLock_getRfid_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getRfid_commandInfo);
-    List<CommandParameter> doorLock_getUserType_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getUserType_commandInfo = new CommandInfo();
-    doorLock_getUserType_commandInfo.name = "getUserType";
-    doorLock_getUserType_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class;
+    doorLock_getRfid_commandParams.add(getRfid_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getRfid_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getRfid_commandParams);
+    doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
+    List<CommandParameter> doorLock_getUserType_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getUserType_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_getUserType_parametersList.add(getUserType_userId_commandParameter);
-
-    doorLock_getUserType_commandInfo.parameters = doorLock_getUserType_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getUserType_commandInfo);
-    List<CommandParameter> doorLock_getWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getWeekdaySchedule_commandInfo = new CommandInfo();
-    doorLock_getWeekdaySchedule_commandInfo.name = "getWeekdaySchedule";
-    doorLock_getWeekdaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class;
+    doorLock_getUserType_commandParams.add(getUserType_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getUserType_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getUserType_commandParams);
+    doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
+    List<CommandParameter> doorLock_getWeekdaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getWeekdaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_getWeekdaySchedule_parametersList.add(getWeekdaySchedule_scheduleId_commandParameter);
+    doorLock_getWeekdaySchedule_commandParams.add(getWeekdaySchedule_scheduleId_commandParameter);
 
     CommandParameter getWeekdaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_getWeekdaySchedule_parametersList.add(getWeekdaySchedule_userId_commandParameter);
-
-    doorLock_getWeekdaySchedule_commandInfo.parameters = doorLock_getWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getWeekdaySchedule_commandInfo);
-    List<CommandParameter> doorLock_getYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_getYeardaySchedule_commandInfo = new CommandInfo();
-    doorLock_getYeardaySchedule_commandInfo.name = "getYeardaySchedule";
-    doorLock_getYeardaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class;
+    doorLock_getWeekdaySchedule_commandParams.add(getWeekdaySchedule_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getWeekdaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getWeekdaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_getYeardaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getYeardaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_getYeardaySchedule_parametersList.add(getYeardaySchedule_scheduleId_commandParameter);
+    doorLock_getYeardaySchedule_commandParams.add(getYeardaySchedule_scheduleId_commandParameter);
 
     CommandParameter getYeardaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_getYeardaySchedule_parametersList.add(getYeardaySchedule_userId_commandParameter);
-
-    doorLock_getYeardaySchedule_commandInfo.parameters = doorLock_getYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_getYeardaySchedule_commandInfo);
-    List<CommandParameter> doorLock_lockDoor_parametersList = new ArrayList<>();
-    CommandInfo doorLock_lockDoor_commandInfo = new CommandInfo();
-    doorLock_lockDoor_commandInfo.name = "lockDoor";
-    doorLock_lockDoor_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.LockDoorResponseCallback.class;
+    doorLock_getYeardaySchedule_commandParams.add(getYeardaySchedule_userId_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_getYeardaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_getYeardaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_lockDoor_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_lockDoor_parametersList.add(lockDoor_pin_commandParameter);
-
-    doorLock_lockDoor_commandInfo.parameters = doorLock_lockDoor_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_lockDoor_commandInfo);
-    List<CommandParameter> doorLock_setHolidaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setHolidaySchedule_commandInfo = new CommandInfo();
-    doorLock_setHolidaySchedule_commandInfo.name = "setHolidaySchedule";
-    doorLock_setHolidaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class;
+    doorLock_lockDoor_commandParams.add(lockDoor_pin_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_lockDoor_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_lockDoor_commandParams);
+    doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
+    List<CommandParameter> doorLock_setHolidaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setHolidaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setHolidaySchedule_parametersList.add(setHolidaySchedule_scheduleId_commandParameter);
+    doorLock_setHolidaySchedule_commandParams.add(setHolidaySchedule_scheduleId_commandParameter);
 
     CommandParameter setHolidaySchedule_localStartTime_commandParameter =
         new CommandParameter("localStartTime", long.class);
-    doorLock_setHolidaySchedule_parametersList.add(
+    doorLock_setHolidaySchedule_commandParams.add(
         setHolidaySchedule_localStartTime_commandParameter);
 
     CommandParameter setHolidaySchedule_localEndTime_commandParameter =
         new CommandParameter("localEndTime", long.class);
-    doorLock_setHolidaySchedule_parametersList.add(
-        setHolidaySchedule_localEndTime_commandParameter);
+    doorLock_setHolidaySchedule_commandParams.add(setHolidaySchedule_localEndTime_commandParameter);
 
     CommandParameter setHolidaySchedule_operatingModeDuringHoliday_commandParameter =
         new CommandParameter("operatingModeDuringHoliday", int.class);
-    doorLock_setHolidaySchedule_parametersList.add(
+    doorLock_setHolidaySchedule_commandParams.add(
         setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
 
-    doorLock_setHolidaySchedule_commandInfo.parameters = doorLock_setHolidaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setHolidaySchedule_commandInfo);
-    List<CommandParameter> doorLock_setPin_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setPin_commandInfo = new CommandInfo();
-    doorLock_setPin_commandInfo.name = "setPin";
-    doorLock_setPin_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetPinResponseCallback.class;
+    // Populate commands
+    CommandInfo doorLock_setHolidaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setHolidaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_setPin_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_setPin_parametersList.add(setPin_userId_commandParameter);
+    doorLock_setPin_commandParams.add(setPin_userId_commandParameter);
 
     CommandParameter setPin_userStatus_commandParameter =
         new CommandParameter("userStatus", int.class);
-    doorLock_setPin_parametersList.add(setPin_userStatus_commandParameter);
+    doorLock_setPin_commandParams.add(setPin_userStatus_commandParameter);
 
     CommandParameter setPin_userType_commandParameter = new CommandParameter("userType", int.class);
-    doorLock_setPin_parametersList.add(setPin_userType_commandParameter);
+    doorLock_setPin_commandParams.add(setPin_userType_commandParameter);
 
     CommandParameter setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_setPin_parametersList.add(setPin_pin_commandParameter);
-
-    doorLock_setPin_commandInfo.parameters = doorLock_setPin_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setPin_commandInfo);
-    List<CommandParameter> doorLock_setRfid_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setRfid_commandInfo = new CommandInfo();
-    doorLock_setRfid_commandInfo.name = "setRfid";
-    doorLock_setRfid_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetRfidResponseCallback.class;
+    doorLock_setPin_commandParams.add(setPin_pin_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_setPin_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setPin_commandParams);
+    doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
+    List<CommandParameter> doorLock_setRfid_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_setRfid_parametersList.add(setRfid_userId_commandParameter);
+    doorLock_setRfid_commandParams.add(setRfid_userId_commandParameter);
 
     CommandParameter setRfid_userStatus_commandParameter =
         new CommandParameter("userStatus", int.class);
-    doorLock_setRfid_parametersList.add(setRfid_userStatus_commandParameter);
+    doorLock_setRfid_commandParams.add(setRfid_userStatus_commandParameter);
 
     CommandParameter setRfid_userType_commandParameter =
         new CommandParameter("userType", int.class);
-    doorLock_setRfid_parametersList.add(setRfid_userType_commandParameter);
+    doorLock_setRfid_commandParams.add(setRfid_userType_commandParameter);
 
     CommandParameter setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
-    doorLock_setRfid_parametersList.add(setRfid_id_commandParameter);
-
-    doorLock_setRfid_commandInfo.parameters = doorLock_setRfid_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setRfid_commandInfo);
-    List<CommandParameter> doorLock_setUserType_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setUserType_commandInfo = new CommandInfo();
-    doorLock_setUserType_commandInfo.name = "setUserType";
-    doorLock_setUserType_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class;
+    doorLock_setRfid_commandParams.add(setRfid_id_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_setRfid_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setRfid_commandParams);
+    doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
+    List<CommandParameter> doorLock_setUserType_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setUserType_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setUserType_parametersList.add(setUserType_userId_commandParameter);
+    doorLock_setUserType_commandParams.add(setUserType_userId_commandParameter);
 
     CommandParameter setUserType_userType_commandParameter =
         new CommandParameter("userType", int.class);
-    doorLock_setUserType_parametersList.add(setUserType_userType_commandParameter);
-
-    doorLock_setUserType_commandInfo.parameters = doorLock_setUserType_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setUserType_commandInfo);
-    List<CommandParameter> doorLock_setWeekdaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setWeekdaySchedule_commandInfo = new CommandInfo();
-    doorLock_setWeekdaySchedule_commandInfo.name = "setWeekdaySchedule";
-    doorLock_setWeekdaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class;
+    doorLock_setUserType_commandParams.add(setUserType_userType_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_setUserType_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setUserType_commandParams);
+    doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
+    List<CommandParameter> doorLock_setWeekdaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setWeekdaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_scheduleId_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_scheduleId_commandParameter);
 
     CommandParameter setWeekdaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_userId_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_userId_commandParameter);
 
     CommandParameter setWeekdaySchedule_daysMask_commandParameter =
         new CommandParameter("daysMask", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_daysMask_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_daysMask_commandParameter);
 
     CommandParameter setWeekdaySchedule_startHour_commandParameter =
         new CommandParameter("startHour", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_startHour_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_startHour_commandParameter);
 
     CommandParameter setWeekdaySchedule_startMinute_commandParameter =
         new CommandParameter("startMinute", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_startMinute_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_startMinute_commandParameter);
 
     CommandParameter setWeekdaySchedule_endHour_commandParameter =
         new CommandParameter("endHour", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_endHour_commandParameter);
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_endHour_commandParameter);
 
     CommandParameter setWeekdaySchedule_endMinute_commandParameter =
         new CommandParameter("endMinute", int.class);
-    doorLock_setWeekdaySchedule_parametersList.add(setWeekdaySchedule_endMinute_commandParameter);
-
-    doorLock_setWeekdaySchedule_commandInfo.parameters = doorLock_setWeekdaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setWeekdaySchedule_commandInfo);
-    List<CommandParameter> doorLock_setYeardaySchedule_parametersList = new ArrayList<>();
-    CommandInfo doorLock_setYeardaySchedule_commandInfo = new CommandInfo();
-    doorLock_setYeardaySchedule_commandInfo.name = "setYeardaySchedule";
-    doorLock_setYeardaySchedule_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class;
+    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_endMinute_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_setWeekdaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setWeekdaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_setYeardaySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setYeardaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setYeardaySchedule_parametersList.add(setYeardaySchedule_scheduleId_commandParameter);
+    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_scheduleId_commandParameter);
 
     CommandParameter setYeardaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setYeardaySchedule_parametersList.add(setYeardaySchedule_userId_commandParameter);
+    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_userId_commandParameter);
 
     CommandParameter setYeardaySchedule_localStartTime_commandParameter =
         new CommandParameter("localStartTime", long.class);
-    doorLock_setYeardaySchedule_parametersList.add(
+    doorLock_setYeardaySchedule_commandParams.add(
         setYeardaySchedule_localStartTime_commandParameter);
 
     CommandParameter setYeardaySchedule_localEndTime_commandParameter =
         new CommandParameter("localEndTime", long.class);
-    doorLock_setYeardaySchedule_parametersList.add(
-        setYeardaySchedule_localEndTime_commandParameter);
-
-    doorLock_setYeardaySchedule_commandInfo.parameters = doorLock_setYeardaySchedule_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_setYeardaySchedule_commandInfo);
-    List<CommandParameter> doorLock_unlockDoor_parametersList = new ArrayList<>();
-    CommandInfo doorLock_unlockDoor_commandInfo = new CommandInfo();
-    doorLock_unlockDoor_commandInfo.name = "unlockDoor";
-    doorLock_unlockDoor_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class;
+    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_localEndTime_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_setYeardaySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_setYeardaySchedule_commandParams);
+    doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
+    List<CommandParameter> doorLock_unlockDoor_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_unlockDoor_parametersList.add(unlockDoor_pin_commandParameter);
-
-    doorLock_unlockDoor_commandInfo.parameters = doorLock_unlockDoor_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_unlockDoor_commandInfo);
-    List<CommandParameter> doorLock_unlockWithTimeout_parametersList = new ArrayList<>();
-    CommandInfo doorLock_unlockWithTimeout_commandInfo = new CommandInfo();
-    doorLock_unlockWithTimeout_commandInfo.name = "unlockWithTimeout";
-    doorLock_unlockWithTimeout_commandInfo.callbackClass =
-        ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class;
+    doorLock_unlockDoor_commandParams.add(unlockDoor_pin_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_unlockDoor_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_unlockDoor_commandParams);
+    doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
+    List<CommandParameter> doorLock_unlockWithTimeout_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter unlockWithTimeout_timeoutInSeconds_commandParameter =
         new CommandParameter("timeoutInSeconds", int.class);
-    doorLock_unlockWithTimeout_parametersList.add(
+    doorLock_unlockWithTimeout_commandParams.add(
         unlockWithTimeout_timeoutInSeconds_commandParameter);
 
     CommandParameter unlockWithTimeout_pin_commandParameter =
         new CommandParameter("pin", byte[].class);
-    doorLock_unlockWithTimeout_parametersList.add(unlockWithTimeout_pin_commandParameter);
+    doorLock_unlockWithTimeout_commandParams.add(unlockWithTimeout_pin_commandParameter);
+
+    // Populate commands
+    CommandInfo doorLock_unlockWithTimeout_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            doorLock_unlockWithTimeout_commandParams);
+    doorLock_ClusterCommandInfo.put("unlockWithTimeout", doorLock_unlockWithTimeout_CommandInfo);
+    // Populate cluster
+    ClusterInfo doorLock_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
+            doorLock_ClusterCommandInfo);
+    clusterMap.put("doorLock", doorLock_clusterInfo);
+    Map<String, CommandInfo> electricalMeasurement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo electricalMeasurement_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
+            electricalMeasurement_ClusterCommandInfo);
+    clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
+    Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
 
-    doorLock_unlockWithTimeout_commandInfo.parameters = doorLock_unlockWithTimeout_parametersList;
-    doorLock_clusterInfo.commands.add(doorLock_unlockWithTimeout_commandInfo);
-    clusterInfoMapping.put("doorLock", doorLock_clusterInfo);
-    ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo("electricalMeasurement");
-    clusterInfoMapping.put("electricalMeasurement", electricalMeasurement_clusterInfo);
+    // Populate commands
+    CommandInfo ethernetNetworkDiagnostics_resetCounts_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            ethernetNetworkDiagnostics_resetCounts_commandParams);
+    ethernetNetworkDiagnostics_ClusterCommandInfo.put(
+        "resetCounts", ethernetNetworkDiagnostics_resetCounts_CommandInfo);
+    // Populate cluster
     ClusterInfo ethernetNetworkDiagnostics_clusterInfo =
-        new ClusterInfo("ethernetNetworkDiagnostics");
-    List<CommandParameter> ethernetNetworkDiagnostics_resetCounts_parametersList =
-        new ArrayList<>();
-    CommandInfo ethernetNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
-    ethernetNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
-    ethernetNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    ethernetNetworkDiagnostics_resetCounts_commandInfo.parameters =
-        ethernetNetworkDiagnostics_resetCounts_parametersList;
-    ethernetNetworkDiagnostics_clusterInfo.commands.add(
-        ethernetNetworkDiagnostics_resetCounts_commandInfo);
-    clusterInfoMapping.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
-    ClusterInfo fixedLabel_clusterInfo = new ClusterInfo("fixedLabel");
-    clusterInfoMapping.put("fixedLabel", fixedLabel_clusterInfo);
-    ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo("flowMeasurement");
-    clusterInfoMapping.put("flowMeasurement", flowMeasurement_clusterInfo);
-    ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo("generalCommissioning");
-    List<CommandParameter> generalCommissioning_armFailSafe_parametersList = new ArrayList<>();
-    CommandInfo generalCommissioning_armFailSafe_commandInfo = new CommandInfo();
-    generalCommissioning_armFailSafe_commandInfo.name = "armFailSafe";
-    generalCommissioning_armFailSafe_commandInfo.callbackClass =
-        ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class;
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId),
+            ethernetNetworkDiagnostics_ClusterCommandInfo);
+    clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
+    Map<String, CommandInfo> fixedLabel_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo fixedLabel_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
+            fixedLabel_ClusterCommandInfo);
+    clusterMap.put("fixedLabel", fixedLabel_clusterInfo);
+    Map<String, CommandInfo> flowMeasurement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo flowMeasurement_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
+            flowMeasurement_ClusterCommandInfo);
+    clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
+    Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> generalCommissioning_armFailSafe_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter armFailSafe_expiryLengthSeconds_commandParameter =
         new CommandParameter("expiryLengthSeconds", int.class);
-    generalCommissioning_armFailSafe_parametersList.add(
+    generalCommissioning_armFailSafe_commandParams.add(
         armFailSafe_expiryLengthSeconds_commandParameter);
 
     CommandParameter armFailSafe_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_armFailSafe_parametersList.add(armFailSafe_breadcrumb_commandParameter);
+    generalCommissioning_armFailSafe_commandParams.add(armFailSafe_breadcrumb_commandParameter);
 
     CommandParameter armFailSafe_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    generalCommissioning_armFailSafe_parametersList.add(armFailSafe_timeoutMs_commandParameter);
+    generalCommissioning_armFailSafe_commandParams.add(armFailSafe_timeoutMs_commandParameter);
 
-    generalCommissioning_armFailSafe_commandInfo.parameters =
-        generalCommissioning_armFailSafe_parametersList;
-    generalCommissioning_clusterInfo.commands.add(generalCommissioning_armFailSafe_commandInfo);
-    List<CommandParameter> generalCommissioning_commissioningComplete_parametersList =
+    // Populate commands
+    CommandInfo generalCommissioning_armFailSafe_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            generalCommissioning_armFailSafe_commandParams);
+    generalCommissioning_ClusterCommandInfo.put(
+        "armFailSafe", generalCommissioning_armFailSafe_CommandInfo);
+    List<CommandParameter> generalCommissioning_commissioningComplete_commandParams =
         new ArrayList<>();
-    CommandInfo generalCommissioning_commissioningComplete_commandInfo = new CommandInfo();
-    generalCommissioning_commissioningComplete_commandInfo.name = "commissioningComplete";
-    generalCommissioning_commissioningComplete_commandInfo.callbackClass =
-        ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class;
-    generalCommissioning_commissioningComplete_commandInfo.parameters =
-        generalCommissioning_commissioningComplete_parametersList;
-    generalCommissioning_clusterInfo.commands.add(
-        generalCommissioning_commissioningComplete_commandInfo);
-    List<CommandParameter> generalCommissioning_setRegulatoryConfig_parametersList =
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo generalCommissioning_commissioningComplete_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            generalCommissioning_commissioningComplete_commandParams);
+    generalCommissioning_ClusterCommandInfo.put(
+        "commissioningComplete", generalCommissioning_commissioningComplete_CommandInfo);
+    List<CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
         new ArrayList<>();
-    CommandInfo generalCommissioning_setRegulatoryConfig_commandInfo = new CommandInfo();
-    generalCommissioning_setRegulatoryConfig_commandInfo.name = "setRegulatoryConfig";
-    generalCommissioning_setRegulatoryConfig_commandInfo.callbackClass =
-        ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter setRegulatoryConfig_location_commandParameter =
         new CommandParameter("location", int.class);
-    generalCommissioning_setRegulatoryConfig_parametersList.add(
+    generalCommissioning_setRegulatoryConfig_commandParams.add(
         setRegulatoryConfig_location_commandParameter);
 
     CommandParameter setRegulatoryConfig_countryCode_commandParameter =
         new CommandParameter("countryCode", String.class);
-    generalCommissioning_setRegulatoryConfig_parametersList.add(
+    generalCommissioning_setRegulatoryConfig_commandParams.add(
         setRegulatoryConfig_countryCode_commandParameter);
 
     CommandParameter setRegulatoryConfig_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_setRegulatoryConfig_parametersList.add(
+    generalCommissioning_setRegulatoryConfig_commandParams.add(
         setRegulatoryConfig_breadcrumb_commandParameter);
 
     CommandParameter setRegulatoryConfig_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    generalCommissioning_setRegulatoryConfig_parametersList.add(
+    generalCommissioning_setRegulatoryConfig_commandParams.add(
         setRegulatoryConfig_timeoutMs_commandParameter);
 
-    generalCommissioning_setRegulatoryConfig_commandInfo.parameters =
-        generalCommissioning_setRegulatoryConfig_parametersList;
-    generalCommissioning_clusterInfo.commands.add(
-        generalCommissioning_setRegulatoryConfig_commandInfo);
-    clusterInfoMapping.put("generalCommissioning", generalCommissioning_clusterInfo);
-    ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo("generalDiagnostics");
-    clusterInfoMapping.put("generalDiagnostics", generalDiagnostics_clusterInfo);
-    ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo("groupKeyManagement");
-    clusterInfoMapping.put("groupKeyManagement", groupKeyManagement_clusterInfo);
-    ClusterInfo groups_clusterInfo = new ClusterInfo("groups");
-    List<CommandParameter> groups_addGroup_parametersList = new ArrayList<>();
-    CommandInfo groups_addGroup_commandInfo = new CommandInfo();
-    groups_addGroup_commandInfo.name = "addGroup";
-    groups_addGroup_commandInfo.callbackClass =
-        ChipClusters.GroupsCluster.AddGroupResponseCallback.class;
-    CommandParameter addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    groups_addGroup_parametersList.add(addGroup_groupId_commandParameter);
+    // Populate commands
+    CommandInfo generalCommissioning_setRegulatoryConfig_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            generalCommissioning_setRegulatoryConfig_commandParams);
+    generalCommissioning_ClusterCommandInfo.put(
+        "setRegulatoryConfig", generalCommissioning_setRegulatoryConfig_CommandInfo);
+    // Populate cluster
+    ClusterInfo generalCommissioning_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
+            generalCommissioning_ClusterCommandInfo);
+    clusterMap.put("generalCommissioning", generalCommissioning_clusterInfo);
+    Map<String, CommandInfo> generalDiagnostics_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo generalDiagnostics_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
+            generalDiagnostics_ClusterCommandInfo);
+    clusterMap.put("generalDiagnostics", generalDiagnostics_clusterInfo);
+    Map<String, CommandInfo> groupKeyManagement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo groupKeyManagement_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId),
+            groupKeyManagement_ClusterCommandInfo);
+    clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
+    Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> groups_addGroup_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
+    groups_addGroup_commandParams.add(addGroup_groupId_commandParameter);
 
     CommandParameter addGroup_groupName_commandParameter =
         new CommandParameter("groupName", String.class);
-    groups_addGroup_parametersList.add(addGroup_groupName_commandParameter);
-
-    groups_addGroup_commandInfo.parameters = groups_addGroup_parametersList;
-    groups_clusterInfo.commands.add(groups_addGroup_commandInfo);
-    List<CommandParameter> groups_addGroupIfIdentifying_parametersList = new ArrayList<>();
-    CommandInfo groups_addGroupIfIdentifying_commandInfo = new CommandInfo();
-    groups_addGroupIfIdentifying_commandInfo.name = "addGroupIfIdentifying";
-    groups_addGroupIfIdentifying_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    groups_addGroup_commandParams.add(addGroup_groupName_commandParameter);
+
+    // Populate commands
+    CommandInfo groups_addGroup_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_addGroup_commandParams);
+    groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
+    List<CommandParameter> groups_addGroupIfIdentifying_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter addGroupIfIdentifying_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    groups_addGroupIfIdentifying_parametersList.add(addGroupIfIdentifying_groupId_commandParameter);
+    groups_addGroupIfIdentifying_commandParams.add(addGroupIfIdentifying_groupId_commandParameter);
 
     CommandParameter addGroupIfIdentifying_groupName_commandParameter =
         new CommandParameter("groupName", String.class);
-    groups_addGroupIfIdentifying_parametersList.add(
+    groups_addGroupIfIdentifying_commandParams.add(
         addGroupIfIdentifying_groupName_commandParameter);
 
-    groups_addGroupIfIdentifying_commandInfo.parameters =
-        groups_addGroupIfIdentifying_parametersList;
-    groups_clusterInfo.commands.add(groups_addGroupIfIdentifying_commandInfo);
-    List<CommandParameter> groups_getGroupMembership_parametersList = new ArrayList<>();
-    CommandInfo groups_getGroupMembership_commandInfo = new CommandInfo();
-    groups_getGroupMembership_commandInfo.name = "getGroupMembership";
-    groups_getGroupMembership_commandInfo.callbackClass =
-        ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class;
+    // Populate commands
+    CommandInfo groups_addGroupIfIdentifying_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_addGroupIfIdentifying_commandParams);
+    groups_ClusterCommandInfo.put(
+        "addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
+    List<CommandParameter> groups_getGroupMembership_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getGroupMembership_groupCount_commandParameter =
         new CommandParameter("groupCount", int.class);
-    groups_getGroupMembership_parametersList.add(getGroupMembership_groupCount_commandParameter);
+    groups_getGroupMembership_commandParams.add(getGroupMembership_groupCount_commandParameter);
 
     CommandParameter getGroupMembership_groupList_commandParameter =
         new CommandParameter("groupList", int.class);
-    groups_getGroupMembership_parametersList.add(getGroupMembership_groupList_commandParameter);
-
-    groups_getGroupMembership_commandInfo.parameters = groups_getGroupMembership_parametersList;
-    groups_clusterInfo.commands.add(groups_getGroupMembership_commandInfo);
-    List<CommandParameter> groups_removeAllGroups_parametersList = new ArrayList<>();
-    CommandInfo groups_removeAllGroups_commandInfo = new CommandInfo();
-    groups_removeAllGroups_commandInfo.name = "removeAllGroups";
-    groups_removeAllGroups_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    groups_removeAllGroups_commandInfo.parameters = groups_removeAllGroups_parametersList;
-    groups_clusterInfo.commands.add(groups_removeAllGroups_commandInfo);
-    List<CommandParameter> groups_removeGroup_parametersList = new ArrayList<>();
-    CommandInfo groups_removeGroup_commandInfo = new CommandInfo();
-    groups_removeGroup_commandInfo.name = "removeGroup";
-    groups_removeGroup_commandInfo.callbackClass =
-        ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class;
+    groups_getGroupMembership_commandParams.add(getGroupMembership_groupList_commandParameter);
+
+    // Populate commands
+    CommandInfo groups_getGroupMembership_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_getGroupMembership_commandParams);
+    groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
+    List<CommandParameter> groups_removeAllGroups_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo groups_removeAllGroups_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_removeAllGroups_commandParams);
+    groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
+    List<CommandParameter> groups_removeGroup_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter removeGroup_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    groups_removeGroup_parametersList.add(removeGroup_groupId_commandParameter);
-
-    groups_removeGroup_commandInfo.parameters = groups_removeGroup_parametersList;
-    groups_clusterInfo.commands.add(groups_removeGroup_commandInfo);
-    List<CommandParameter> groups_viewGroup_parametersList = new ArrayList<>();
-    CommandInfo groups_viewGroup_commandInfo = new CommandInfo();
-    groups_viewGroup_commandInfo.name = "viewGroup";
-    groups_viewGroup_commandInfo.callbackClass =
-        ChipClusters.GroupsCluster.ViewGroupResponseCallback.class;
+    groups_removeGroup_commandParams.add(removeGroup_groupId_commandParameter);
+
+    // Populate commands
+    CommandInfo groups_removeGroup_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_removeGroup_commandParams);
+    groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
+    List<CommandParameter> groups_viewGroup_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter viewGroup_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    groups_viewGroup_parametersList.add(viewGroup_groupId_commandParameter);
-
-    groups_viewGroup_commandInfo.parameters = groups_viewGroup_parametersList;
-    groups_clusterInfo.commands.add(groups_viewGroup_commandInfo);
-    clusterInfoMapping.put("groups", groups_clusterInfo);
-    ClusterInfo identify_clusterInfo = new ClusterInfo("identify");
-    List<CommandParameter> identify_identify_parametersList = new ArrayList<>();
-    CommandInfo identify_identify_commandInfo = new CommandInfo();
-    identify_identify_commandInfo.name = "identify";
-    identify_identify_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    groups_viewGroup_commandParams.add(viewGroup_groupId_commandParameter);
+
+    // Populate commands
+    CommandInfo groups_viewGroup_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            groups_viewGroup_commandParams);
+    groups_ClusterCommandInfo.put("viewGroup", groups_viewGroup_CommandInfo);
+    // Populate cluster
+    ClusterInfo groups_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId),
+            groups_ClusterCommandInfo);
+    clusterMap.put("groups", groups_clusterInfo);
+    Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> identify_identify_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter identify_identifyTime_commandParameter =
         new CommandParameter("identifyTime", int.class);
-    identify_identify_parametersList.add(identify_identifyTime_commandParameter);
-
-    identify_identify_commandInfo.parameters = identify_identify_parametersList;
-    identify_clusterInfo.commands.add(identify_identify_commandInfo);
-    List<CommandParameter> identify_identifyQuery_parametersList = new ArrayList<>();
-    CommandInfo identify_identifyQuery_commandInfo = new CommandInfo();
-    identify_identifyQuery_commandInfo.name = "identifyQuery";
-    identify_identifyQuery_commandInfo.callbackClass =
-        ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class;
-    identify_identifyQuery_commandInfo.parameters = identify_identifyQuery_parametersList;
-    identify_clusterInfo.commands.add(identify_identifyQuery_commandInfo);
-    List<CommandParameter> identify_triggerEffect_parametersList = new ArrayList<>();
-    CommandInfo identify_triggerEffect_commandInfo = new CommandInfo();
-    identify_triggerEffect_commandInfo.name = "triggerEffect";
-    identify_triggerEffect_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    identify_identify_commandParams.add(identify_identifyTime_commandParameter);
+
+    // Populate commands
+    CommandInfo identify_identify_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            identify_identify_commandParams);
+    identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
+    List<CommandParameter> identify_identifyQuery_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo identify_identifyQuery_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            identify_identifyQuery_commandParams);
+    identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
+    List<CommandParameter> identify_triggerEffect_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter triggerEffect_effectIdentifier_commandParameter =
         new CommandParameter("effectIdentifier", int.class);
-    identify_triggerEffect_parametersList.add(triggerEffect_effectIdentifier_commandParameter);
+    identify_triggerEffect_commandParams.add(triggerEffect_effectIdentifier_commandParameter);
 
     CommandParameter triggerEffect_effectVariant_commandParameter =
         new CommandParameter("effectVariant", int.class);
-    identify_triggerEffect_parametersList.add(triggerEffect_effectVariant_commandParameter);
-
-    identify_triggerEffect_commandInfo.parameters = identify_triggerEffect_parametersList;
-    identify_clusterInfo.commands.add(identify_triggerEffect_commandInfo);
-    clusterInfoMapping.put("identify", identify_clusterInfo);
-    ClusterInfo keypadInput_clusterInfo = new ClusterInfo("keypadInput");
-    List<CommandParameter> keypadInput_sendKey_parametersList = new ArrayList<>();
-    CommandInfo keypadInput_sendKey_commandInfo = new CommandInfo();
-    keypadInput_sendKey_commandInfo.name = "sendKey";
-    keypadInput_sendKey_commandInfo.callbackClass =
-        ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class;
+    identify_triggerEffect_commandParams.add(triggerEffect_effectVariant_commandParameter);
+
+    // Populate commands
+    CommandInfo identify_triggerEffect_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            identify_triggerEffect_commandParams);
+    identify_ClusterCommandInfo.put("triggerEffect", identify_triggerEffect_CommandInfo);
+    // Populate cluster
+    ClusterInfo identify_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
+            identify_ClusterCommandInfo);
+    clusterMap.put("identify", identify_clusterInfo);
+    Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> keypadInput_sendKey_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
-    keypadInput_sendKey_parametersList.add(sendKey_keyCode_commandParameter);
-
-    keypadInput_sendKey_commandInfo.parameters = keypadInput_sendKey_parametersList;
-    keypadInput_clusterInfo.commands.add(keypadInput_sendKey_commandInfo);
-    clusterInfoMapping.put("keypadInput", keypadInput_clusterInfo);
-    ClusterInfo levelControl_clusterInfo = new ClusterInfo("levelControl");
-    List<CommandParameter> levelControl_move_parametersList = new ArrayList<>();
-    CommandInfo levelControl_move_commandInfo = new CommandInfo();
-    levelControl_move_commandInfo.name = "move";
-    levelControl_move_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    keypadInput_sendKey_commandParams.add(sendKey_keyCode_commandParameter);
+
+    // Populate commands
+    CommandInfo keypadInput_sendKey_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            keypadInput_sendKey_commandParams);
+    keypadInput_ClusterCommandInfo.put("sendKey", keypadInput_sendKey_CommandInfo);
+    // Populate cluster
+    ClusterInfo keypadInput_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
+            keypadInput_ClusterCommandInfo);
+    clusterMap.put("keypadInput", keypadInput_clusterInfo);
+    Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> levelControl_move_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter move_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    levelControl_move_parametersList.add(move_moveMode_commandParameter);
+    levelControl_move_commandParams.add(move_moveMode_commandParameter);
 
     CommandParameter move_rate_commandParameter = new CommandParameter("rate", int.class);
-    levelControl_move_parametersList.add(move_rate_commandParameter);
+    levelControl_move_commandParams.add(move_rate_commandParameter);
 
     CommandParameter move_optionMask_commandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_move_parametersList.add(move_optionMask_commandParameter);
+    levelControl_move_commandParams.add(move_optionMask_commandParameter);
 
     CommandParameter move_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
-    levelControl_move_parametersList.add(move_optionOverride_commandParameter);
-
-    levelControl_move_commandInfo.parameters = levelControl_move_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_move_commandInfo);
-    List<CommandParameter> levelControl_moveToLevel_parametersList = new ArrayList<>();
-    CommandInfo levelControl_moveToLevel_commandInfo = new CommandInfo();
-    levelControl_moveToLevel_commandInfo.name = "moveToLevel";
-    levelControl_moveToLevel_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    levelControl_move_commandParams.add(move_optionOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_move_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_move_commandParams);
+    levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
+    List<CommandParameter> levelControl_moveToLevel_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToLevel_level_commandParameter = new CommandParameter("level", int.class);
-    levelControl_moveToLevel_parametersList.add(moveToLevel_level_commandParameter);
+    levelControl_moveToLevel_commandParams.add(moveToLevel_level_commandParameter);
 
     CommandParameter moveToLevel_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_moveToLevel_parametersList.add(moveToLevel_transitionTime_commandParameter);
+    levelControl_moveToLevel_commandParams.add(moveToLevel_transitionTime_commandParameter);
 
     CommandParameter moveToLevel_optionMask_commandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_moveToLevel_parametersList.add(moveToLevel_optionMask_commandParameter);
+    levelControl_moveToLevel_commandParams.add(moveToLevel_optionMask_commandParameter);
 
     CommandParameter moveToLevel_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
-    levelControl_moveToLevel_parametersList.add(moveToLevel_optionOverride_commandParameter);
-
-    levelControl_moveToLevel_commandInfo.parameters = levelControl_moveToLevel_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_moveToLevel_commandInfo);
-    List<CommandParameter> levelControl_moveToLevelWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo levelControl_moveToLevelWithOnOff_commandInfo = new CommandInfo();
-    levelControl_moveToLevelWithOnOff_commandInfo.name = "moveToLevelWithOnOff";
-    levelControl_moveToLevelWithOnOff_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    levelControl_moveToLevel_commandParams.add(moveToLevel_optionOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_moveToLevel_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_moveToLevel_commandParams);
+    levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
+    List<CommandParameter> levelControl_moveToLevelWithOnOff_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveToLevelWithOnOff_level_commandParameter =
         new CommandParameter("level", int.class);
-    levelControl_moveToLevelWithOnOff_parametersList.add(
+    levelControl_moveToLevelWithOnOff_commandParams.add(
         moveToLevelWithOnOff_level_commandParameter);
 
     CommandParameter moveToLevelWithOnOff_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_moveToLevelWithOnOff_parametersList.add(
+    levelControl_moveToLevelWithOnOff_commandParams.add(
         moveToLevelWithOnOff_transitionTime_commandParameter);
 
-    levelControl_moveToLevelWithOnOff_commandInfo.parameters =
-        levelControl_moveToLevelWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_moveToLevelWithOnOff_commandInfo);
-    List<CommandParameter> levelControl_moveWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo levelControl_moveWithOnOff_commandInfo = new CommandInfo();
-    levelControl_moveWithOnOff_commandInfo.name = "moveWithOnOff";
-    levelControl_moveWithOnOff_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo levelControl_moveToLevelWithOnOff_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_moveToLevelWithOnOff_commandParams);
+    levelControl_ClusterCommandInfo.put(
+        "moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
+    List<CommandParameter> levelControl_moveWithOnOff_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter moveWithOnOff_moveMode_commandParameter =
         new CommandParameter("moveMode", int.class);
-    levelControl_moveWithOnOff_parametersList.add(moveWithOnOff_moveMode_commandParameter);
+    levelControl_moveWithOnOff_commandParams.add(moveWithOnOff_moveMode_commandParameter);
 
     CommandParameter moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
-    levelControl_moveWithOnOff_parametersList.add(moveWithOnOff_rate_commandParameter);
-
-    levelControl_moveWithOnOff_commandInfo.parameters = levelControl_moveWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_moveWithOnOff_commandInfo);
-    List<CommandParameter> levelControl_step_parametersList = new ArrayList<>();
-    CommandInfo levelControl_step_commandInfo = new CommandInfo();
-    levelControl_step_commandInfo.name = "step";
-    levelControl_step_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    levelControl_moveWithOnOff_commandParams.add(moveWithOnOff_rate_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_moveWithOnOff_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_moveWithOnOff_commandParams);
+    levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
+    List<CommandParameter> levelControl_step_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter step_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    levelControl_step_parametersList.add(step_stepMode_commandParameter);
+    levelControl_step_commandParams.add(step_stepMode_commandParameter);
 
     CommandParameter step_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    levelControl_step_parametersList.add(step_stepSize_commandParameter);
+    levelControl_step_commandParams.add(step_stepSize_commandParameter);
 
     CommandParameter step_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_step_parametersList.add(step_transitionTime_commandParameter);
+    levelControl_step_commandParams.add(step_transitionTime_commandParameter);
 
     CommandParameter step_optionMask_commandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_step_parametersList.add(step_optionMask_commandParameter);
+    levelControl_step_commandParams.add(step_optionMask_commandParameter);
 
     CommandParameter step_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
-    levelControl_step_parametersList.add(step_optionOverride_commandParameter);
-
-    levelControl_step_commandInfo.parameters = levelControl_step_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_step_commandInfo);
-    List<CommandParameter> levelControl_stepWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo levelControl_stepWithOnOff_commandInfo = new CommandInfo();
-    levelControl_stepWithOnOff_commandInfo.name = "stepWithOnOff";
-    levelControl_stepWithOnOff_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    levelControl_step_commandParams.add(step_optionOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_step_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_step_commandParams);
+    levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
+    List<CommandParameter> levelControl_stepWithOnOff_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stepWithOnOff_stepMode_commandParameter =
         new CommandParameter("stepMode", int.class);
-    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_stepMode_commandParameter);
+    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_stepMode_commandParameter);
 
     CommandParameter stepWithOnOff_stepSize_commandParameter =
         new CommandParameter("stepSize", int.class);
-    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_stepSize_commandParameter);
+    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_stepSize_commandParameter);
 
     CommandParameter stepWithOnOff_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_stepWithOnOff_parametersList.add(stepWithOnOff_transitionTime_commandParameter);
-
-    levelControl_stepWithOnOff_commandInfo.parameters = levelControl_stepWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_stepWithOnOff_commandInfo);
-    List<CommandParameter> levelControl_stop_parametersList = new ArrayList<>();
-    CommandInfo levelControl_stop_commandInfo = new CommandInfo();
-    levelControl_stop_commandInfo.name = "stop";
-    levelControl_stop_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_transitionTime_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_stepWithOnOff_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_stepWithOnOff_commandParams);
+    levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
+    List<CommandParameter> levelControl_stop_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter stop_optionMask_commandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_stop_parametersList.add(stop_optionMask_commandParameter);
+    levelControl_stop_commandParams.add(stop_optionMask_commandParameter);
 
     CommandParameter stop_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
-    levelControl_stop_parametersList.add(stop_optionOverride_commandParameter);
-
-    levelControl_stop_commandInfo.parameters = levelControl_stop_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_stop_commandInfo);
-    List<CommandParameter> levelControl_stopWithOnOff_parametersList = new ArrayList<>();
-    CommandInfo levelControl_stopWithOnOff_commandInfo = new CommandInfo();
-    levelControl_stopWithOnOff_commandInfo.name = "stopWithOnOff";
-    levelControl_stopWithOnOff_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    levelControl_stopWithOnOff_commandInfo.parameters = levelControl_stopWithOnOff_parametersList;
-    levelControl_clusterInfo.commands.add(levelControl_stopWithOnOff_commandInfo);
-    clusterInfoMapping.put("levelControl", levelControl_clusterInfo);
-    ClusterInfo lowPower_clusterInfo = new ClusterInfo("lowPower");
-    List<CommandParameter> lowPower_sleep_parametersList = new ArrayList<>();
-    CommandInfo lowPower_sleep_commandInfo = new CommandInfo();
-    lowPower_sleep_commandInfo.name = "sleep";
-    lowPower_sleep_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    lowPower_sleep_commandInfo.parameters = lowPower_sleep_parametersList;
-    lowPower_clusterInfo.commands.add(lowPower_sleep_commandInfo);
-    clusterInfoMapping.put("lowPower", lowPower_clusterInfo);
-    ClusterInfo mediaInput_clusterInfo = new ClusterInfo("mediaInput");
-    List<CommandParameter> mediaInput_hideInputStatus_parametersList = new ArrayList<>();
-    CommandInfo mediaInput_hideInputStatus_commandInfo = new CommandInfo();
-    mediaInput_hideInputStatus_commandInfo.name = "hideInputStatus";
-    mediaInput_hideInputStatus_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    mediaInput_hideInputStatus_commandInfo.parameters = mediaInput_hideInputStatus_parametersList;
-    mediaInput_clusterInfo.commands.add(mediaInput_hideInputStatus_commandInfo);
-    List<CommandParameter> mediaInput_renameInput_parametersList = new ArrayList<>();
-    CommandInfo mediaInput_renameInput_commandInfo = new CommandInfo();
-    mediaInput_renameInput_commandInfo.name = "renameInput";
-    mediaInput_renameInput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    levelControl_stop_commandParams.add(stop_optionOverride_commandParameter);
+
+    // Populate commands
+    CommandInfo levelControl_stop_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_stop_commandParams);
+    levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
+    List<CommandParameter> levelControl_stopWithOnOff_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo levelControl_stopWithOnOff_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            levelControl_stopWithOnOff_commandParams);
+    levelControl_ClusterCommandInfo.put("stopWithOnOff", levelControl_stopWithOnOff_CommandInfo);
+    // Populate cluster
+    ClusterInfo levelControl_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
+            levelControl_ClusterCommandInfo);
+    clusterMap.put("levelControl", levelControl_clusterInfo);
+    Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> lowPower_sleep_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo lowPower_sleep_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            lowPower_sleep_commandParams);
+    lowPower_ClusterCommandInfo.put("sleep", lowPower_sleep_CommandInfo);
+    // Populate cluster
+    ClusterInfo lowPower_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
+            lowPower_ClusterCommandInfo);
+    clusterMap.put("lowPower", lowPower_clusterInfo);
+    Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> mediaInput_hideInputStatus_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaInput_hideInputStatus_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInput_hideInputStatus_commandParams);
+    mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
+    List<CommandParameter> mediaInput_renameInput_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter renameInput_index_commandParameter = new CommandParameter("index", int.class);
-    mediaInput_renameInput_parametersList.add(renameInput_index_commandParameter);
+    mediaInput_renameInput_commandParams.add(renameInput_index_commandParameter);
 
     CommandParameter renameInput_name_commandParameter = new CommandParameter("name", String.class);
-    mediaInput_renameInput_parametersList.add(renameInput_name_commandParameter);
-
-    mediaInput_renameInput_commandInfo.parameters = mediaInput_renameInput_parametersList;
-    mediaInput_clusterInfo.commands.add(mediaInput_renameInput_commandInfo);
-    List<CommandParameter> mediaInput_selectInput_parametersList = new ArrayList<>();
-    CommandInfo mediaInput_selectInput_commandInfo = new CommandInfo();
-    mediaInput_selectInput_commandInfo.name = "selectInput";
-    mediaInput_selectInput_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    mediaInput_renameInput_commandParams.add(renameInput_name_commandParameter);
+
+    // Populate commands
+    CommandInfo mediaInput_renameInput_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInput_renameInput_commandParams);
+    mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
+    List<CommandParameter> mediaInput_selectInput_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter selectInput_index_commandParameter = new CommandParameter("index", int.class);
-    mediaInput_selectInput_parametersList.add(selectInput_index_commandParameter);
-
-    mediaInput_selectInput_commandInfo.parameters = mediaInput_selectInput_parametersList;
-    mediaInput_clusterInfo.commands.add(mediaInput_selectInput_commandInfo);
-    List<CommandParameter> mediaInput_showInputStatus_parametersList = new ArrayList<>();
-    CommandInfo mediaInput_showInputStatus_commandInfo = new CommandInfo();
-    mediaInput_showInputStatus_commandInfo.name = "showInputStatus";
-    mediaInput_showInputStatus_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    mediaInput_showInputStatus_commandInfo.parameters = mediaInput_showInputStatus_parametersList;
-    mediaInput_clusterInfo.commands.add(mediaInput_showInputStatus_commandInfo);
-    clusterInfoMapping.put("mediaInput", mediaInput_clusterInfo);
-    ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo("mediaPlayback");
-    List<CommandParameter> mediaPlayback_mediaFastForward_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaFastForward_commandInfo = new CommandInfo();
-    mediaPlayback_mediaFastForward_commandInfo.name = "mediaFastForward";
-    mediaPlayback_mediaFastForward_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class;
-    mediaPlayback_mediaFastForward_commandInfo.parameters =
-        mediaPlayback_mediaFastForward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaFastForward_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaNext_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaNext_commandInfo = new CommandInfo();
-    mediaPlayback_mediaNext_commandInfo.name = "mediaNext";
-    mediaPlayback_mediaNext_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class;
-    mediaPlayback_mediaNext_commandInfo.parameters = mediaPlayback_mediaNext_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaNext_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaPause_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaPause_commandInfo = new CommandInfo();
-    mediaPlayback_mediaPause_commandInfo.name = "mediaPause";
-    mediaPlayback_mediaPause_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class;
-    mediaPlayback_mediaPause_commandInfo.parameters = mediaPlayback_mediaPause_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPause_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaPlay_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaPlay_commandInfo = new CommandInfo();
-    mediaPlayback_mediaPlay_commandInfo.name = "mediaPlay";
-    mediaPlayback_mediaPlay_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class;
-    mediaPlayback_mediaPlay_commandInfo.parameters = mediaPlayback_mediaPlay_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPlay_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaPrevious_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaPrevious_commandInfo = new CommandInfo();
-    mediaPlayback_mediaPrevious_commandInfo.name = "mediaPrevious";
-    mediaPlayback_mediaPrevious_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class;
-    mediaPlayback_mediaPrevious_commandInfo.parameters = mediaPlayback_mediaPrevious_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaPrevious_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaRewind_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaRewind_commandInfo = new CommandInfo();
-    mediaPlayback_mediaRewind_commandInfo.name = "mediaRewind";
-    mediaPlayback_mediaRewind_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class;
-    mediaPlayback_mediaRewind_commandInfo.parameters = mediaPlayback_mediaRewind_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaRewind_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaSeek_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaSeek_commandInfo = new CommandInfo();
-    mediaPlayback_mediaSeek_commandInfo.name = "mediaSeek";
-    mediaPlayback_mediaSeek_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class;
+    mediaInput_selectInput_commandParams.add(selectInput_index_commandParameter);
+
+    // Populate commands
+    CommandInfo mediaInput_selectInput_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInput_selectInput_commandParams);
+    mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
+    List<CommandParameter> mediaInput_showInputStatus_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaInput_showInputStatus_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaInput_showInputStatus_commandParams);
+    mediaInput_ClusterCommandInfo.put("showInputStatus", mediaInput_showInputStatus_CommandInfo);
+    // Populate cluster
+    ClusterInfo mediaInput_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
+            mediaInput_ClusterCommandInfo);
+    clusterMap.put("mediaInput", mediaInput_clusterInfo);
+    Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> mediaPlayback_mediaFastForward_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaFastForward_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaFastForward_commandParams);
+    mediaPlayback_ClusterCommandInfo.put(
+        "mediaFastForward", mediaPlayback_mediaFastForward_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaNext_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaNext_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaNext_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaPause_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaPause_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaPause_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaPlay_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaPlay_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaPlay_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaPrevious_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaPrevious_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaPrevious_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaRewind_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaRewind_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaRewind_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaSeek_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter mediaSeek_position_commandParameter =
         new CommandParameter("position", long.class);
-    mediaPlayback_mediaSeek_parametersList.add(mediaSeek_position_commandParameter);
-
-    mediaPlayback_mediaSeek_commandInfo.parameters = mediaPlayback_mediaSeek_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSeek_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaSkipBackward_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaSkipBackward_commandInfo = new CommandInfo();
-    mediaPlayback_mediaSkipBackward_commandInfo.name = "mediaSkipBackward";
-    mediaPlayback_mediaSkipBackward_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class;
+    mediaPlayback_mediaSeek_commandParams.add(mediaSeek_position_commandParameter);
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaSeek_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaSeek_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaSkipBackward_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter mediaSkipBackward_deltaPositionMilliseconds_commandParameter =
         new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipBackward_parametersList.add(
+    mediaPlayback_mediaSkipBackward_commandParams.add(
         mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
 
-    mediaPlayback_mediaSkipBackward_commandInfo.parameters =
-        mediaPlayback_mediaSkipBackward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSkipBackward_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaSkipForward_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaSkipForward_commandInfo = new CommandInfo();
-    mediaPlayback_mediaSkipForward_commandInfo.name = "mediaSkipForward";
-    mediaPlayback_mediaSkipForward_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class;
+    // Populate commands
+    CommandInfo mediaPlayback_mediaSkipBackward_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaSkipBackward_commandParams);
+    mediaPlayback_ClusterCommandInfo.put(
+        "mediaSkipBackward", mediaPlayback_mediaSkipBackward_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaSkipForward_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter mediaSkipForward_deltaPositionMilliseconds_commandParameter =
         new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipForward_parametersList.add(
+    mediaPlayback_mediaSkipForward_commandParams.add(
         mediaSkipForward_deltaPositionMilliseconds_commandParameter);
 
-    mediaPlayback_mediaSkipForward_commandInfo.parameters =
-        mediaPlayback_mediaSkipForward_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaSkipForward_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaStartOver_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaStartOver_commandInfo = new CommandInfo();
-    mediaPlayback_mediaStartOver_commandInfo.name = "mediaStartOver";
-    mediaPlayback_mediaStartOver_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class;
-    mediaPlayback_mediaStartOver_commandInfo.parameters =
-        mediaPlayback_mediaStartOver_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaStartOver_commandInfo);
-    List<CommandParameter> mediaPlayback_mediaStop_parametersList = new ArrayList<>();
-    CommandInfo mediaPlayback_mediaStop_commandInfo = new CommandInfo();
-    mediaPlayback_mediaStop_commandInfo.name = "mediaStop";
-    mediaPlayback_mediaStop_commandInfo.callbackClass =
-        ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class;
-    mediaPlayback_mediaStop_commandInfo.parameters = mediaPlayback_mediaStop_parametersList;
-    mediaPlayback_clusterInfo.commands.add(mediaPlayback_mediaStop_commandInfo);
-    clusterInfoMapping.put("mediaPlayback", mediaPlayback_clusterInfo);
-    ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo("networkCommissioning");
-    List<CommandParameter> networkCommissioning_addThreadNetwork_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_addThreadNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_addThreadNetwork_commandInfo.name = "addThreadNetwork";
-    networkCommissioning_addThreadNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo mediaPlayback_mediaSkipForward_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaSkipForward_commandParams);
+    mediaPlayback_ClusterCommandInfo.put(
+        "mediaSkipForward", mediaPlayback_mediaSkipForward_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaStartOver_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaStartOver_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaStartOver_commandParams);
+    mediaPlayback_ClusterCommandInfo.put(
+        "mediaStartOver", mediaPlayback_mediaStartOver_CommandInfo);
+    List<CommandParameter> mediaPlayback_mediaStop_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo mediaPlayback_mediaStop_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            mediaPlayback_mediaStop_commandParams);
+    mediaPlayback_ClusterCommandInfo.put("mediaStop", mediaPlayback_mediaStop_CommandInfo);
+    // Populate cluster
+    ClusterInfo mediaPlayback_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
+            mediaPlayback_ClusterCommandInfo);
+    clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
+    Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> networkCommissioning_addThreadNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter addThreadNetwork_operationalDataset_commandParameter =
         new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_addThreadNetwork_parametersList.add(
+    networkCommissioning_addThreadNetwork_commandParams.add(
         addThreadNetwork_operationalDataset_commandParameter);
 
     CommandParameter addThreadNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addThreadNetwork_parametersList.add(
+    networkCommissioning_addThreadNetwork_commandParams.add(
         addThreadNetwork_breadcrumb_commandParameter);
 
     CommandParameter addThreadNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_addThreadNetwork_parametersList.add(
+    networkCommissioning_addThreadNetwork_commandParams.add(
         addThreadNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_addThreadNetwork_commandInfo.parameters =
-        networkCommissioning_addThreadNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(
-        networkCommissioning_addThreadNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_addWiFiNetwork_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_addWiFiNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_addWiFiNetwork_commandInfo.name = "addWiFiNetwork";
-    networkCommissioning_addWiFiNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo networkCommissioning_addThreadNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_addThreadNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "addThreadNetwork", networkCommissioning_addThreadNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_addWiFiNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter addWiFiNetwork_ssid_commandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_addWiFiNetwork_parametersList.add(addWiFiNetwork_ssid_commandParameter);
+    networkCommissioning_addWiFiNetwork_commandParams.add(addWiFiNetwork_ssid_commandParameter);
 
     CommandParameter addWiFiNetwork_credentials_commandParameter =
         new CommandParameter("credentials", byte[].class);
-    networkCommissioning_addWiFiNetwork_parametersList.add(
+    networkCommissioning_addWiFiNetwork_commandParams.add(
         addWiFiNetwork_credentials_commandParameter);
 
     CommandParameter addWiFiNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addWiFiNetwork_parametersList.add(
+    networkCommissioning_addWiFiNetwork_commandParams.add(
         addWiFiNetwork_breadcrumb_commandParameter);
 
     CommandParameter addWiFiNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_addWiFiNetwork_parametersList.add(
+    networkCommissioning_addWiFiNetwork_commandParams.add(
         addWiFiNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_addWiFiNetwork_commandInfo.parameters =
-        networkCommissioning_addWiFiNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(networkCommissioning_addWiFiNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_disableNetwork_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_disableNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_disableNetwork_commandInfo.name = "disableNetwork";
-    networkCommissioning_disableNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo networkCommissioning_addWiFiNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_addWiFiNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "addWiFiNetwork", networkCommissioning_addWiFiNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_disableNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter disableNetwork_networkID_commandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_disableNetwork_parametersList.add(
+    networkCommissioning_disableNetwork_commandParams.add(
         disableNetwork_networkID_commandParameter);
 
     CommandParameter disableNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_disableNetwork_parametersList.add(
+    networkCommissioning_disableNetwork_commandParams.add(
         disableNetwork_breadcrumb_commandParameter);
 
     CommandParameter disableNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_disableNetwork_parametersList.add(
+    networkCommissioning_disableNetwork_commandParams.add(
         disableNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_disableNetwork_commandInfo.parameters =
-        networkCommissioning_disableNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(networkCommissioning_disableNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_enableNetwork_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_enableNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_enableNetwork_commandInfo.name = "enableNetwork";
-    networkCommissioning_enableNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo networkCommissioning_disableNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_disableNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "disableNetwork", networkCommissioning_disableNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_enableNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter enableNetwork_networkID_commandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_enableNetwork_parametersList.add(enableNetwork_networkID_commandParameter);
+    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_networkID_commandParameter);
 
     CommandParameter enableNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_enableNetwork_parametersList.add(
-        enableNetwork_breadcrumb_commandParameter);
+    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_breadcrumb_commandParameter);
 
     CommandParameter enableNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_enableNetwork_parametersList.add(enableNetwork_timeoutMs_commandParameter);
+    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_enableNetwork_commandInfo.parameters =
-        networkCommissioning_enableNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(networkCommissioning_enableNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_parametersList =
+    // Populate commands
+    CommandInfo networkCommissioning_enableNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_enableNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "enableNetwork", networkCommissioning_enableNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_commandParams =
         new ArrayList<>();
-    CommandInfo networkCommissioning_getLastNetworkCommissioningResult_commandInfo =
-        new CommandInfo();
-    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.name =
-        "getLastNetworkCommissioningResult";
-    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter getLastNetworkCommissioningResult_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_getLastNetworkCommissioningResult_parametersList.add(
+    networkCommissioning_getLastNetworkCommissioningResult_commandParams.add(
         getLastNetworkCommissioningResult_timeoutMs_commandParameter);
 
-    networkCommissioning_getLastNetworkCommissioningResult_commandInfo.parameters =
-        networkCommissioning_getLastNetworkCommissioningResult_parametersList;
-    networkCommissioning_clusterInfo.commands.add(
-        networkCommissioning_getLastNetworkCommissioningResult_commandInfo);
-    List<CommandParameter> networkCommissioning_removeNetwork_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_removeNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_removeNetwork_commandInfo.name = "removeNetwork";
-    networkCommissioning_removeNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo networkCommissioning_getLastNetworkCommissioningResult_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_getLastNetworkCommissioningResult_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "getLastNetworkCommissioningResult",
+        networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
+    List<CommandParameter> networkCommissioning_removeNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter removeNetwork_networkID_commandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_removeNetwork_parametersList.add(removeNetwork_networkID_commandParameter);
+    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_networkID_commandParameter);
 
     CommandParameter removeNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_removeNetwork_parametersList.add(
-        removeNetwork_breadcrumb_commandParameter);
+    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_breadcrumb_commandParameter);
 
     CommandParameter removeNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_removeNetwork_parametersList.add(removeNetwork_timeoutMs_commandParameter);
-
-    networkCommissioning_removeNetwork_commandInfo.parameters =
-        networkCommissioning_removeNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(networkCommissioning_removeNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_scanNetworks_parametersList = new ArrayList<>();
-    CommandInfo networkCommissioning_scanNetworks_commandInfo = new CommandInfo();
-    networkCommissioning_scanNetworks_commandInfo.name = "scanNetworks";
-    networkCommissioning_scanNetworks_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class;
+    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_timeoutMs_commandParameter);
+
+    // Populate commands
+    CommandInfo networkCommissioning_removeNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_removeNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "removeNetwork", networkCommissioning_removeNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_scanNetworks_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter scanNetworks_ssid_commandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_ssid_commandParameter);
+    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_ssid_commandParameter);
 
     CommandParameter scanNetworks_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_breadcrumb_commandParameter);
+    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_breadcrumb_commandParameter);
 
     CommandParameter scanNetworks_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_scanNetworks_parametersList.add(scanNetworks_timeoutMs_commandParameter);
+    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_timeoutMs_commandParameter);
 
-    networkCommissioning_scanNetworks_commandInfo.parameters =
-        networkCommissioning_scanNetworks_parametersList;
-    networkCommissioning_clusterInfo.commands.add(networkCommissioning_scanNetworks_commandInfo);
-    List<CommandParameter> networkCommissioning_updateThreadNetwork_parametersList =
+    // Populate commands
+    CommandInfo networkCommissioning_scanNetworks_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_scanNetworks_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "scanNetworks", networkCommissioning_scanNetworks_CommandInfo);
+    List<CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
         new ArrayList<>();
-    CommandInfo networkCommissioning_updateThreadNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_updateThreadNetwork_commandInfo.name = "updateThreadNetwork";
-    networkCommissioning_updateThreadNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter updateThreadNetwork_operationalDataset_commandParameter =
         new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_updateThreadNetwork_parametersList.add(
+    networkCommissioning_updateThreadNetwork_commandParams.add(
         updateThreadNetwork_operationalDataset_commandParameter);
 
     CommandParameter updateThreadNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateThreadNetwork_parametersList.add(
+    networkCommissioning_updateThreadNetwork_commandParams.add(
         updateThreadNetwork_breadcrumb_commandParameter);
 
     CommandParameter updateThreadNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_updateThreadNetwork_parametersList.add(
+    networkCommissioning_updateThreadNetwork_commandParams.add(
         updateThreadNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_updateThreadNetwork_commandInfo.parameters =
-        networkCommissioning_updateThreadNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(
-        networkCommissioning_updateThreadNetwork_commandInfo);
-    List<CommandParameter> networkCommissioning_updateWiFiNetwork_parametersList =
-        new ArrayList<>();
-    CommandInfo networkCommissioning_updateWiFiNetwork_commandInfo = new CommandInfo();
-    networkCommissioning_updateWiFiNetwork_commandInfo.name = "updateWiFiNetwork";
-    networkCommissioning_updateWiFiNetwork_commandInfo.callbackClass =
-        ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class;
+    // Populate commands
+    CommandInfo networkCommissioning_updateThreadNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_updateThreadNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "updateThreadNetwork", networkCommissioning_updateThreadNetwork_CommandInfo);
+    List<CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter updateWiFiNetwork_ssid_commandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_updateWiFiNetwork_parametersList.add(
+    networkCommissioning_updateWiFiNetwork_commandParams.add(
         updateWiFiNetwork_ssid_commandParameter);
 
     CommandParameter updateWiFiNetwork_credentials_commandParameter =
         new CommandParameter("credentials", byte[].class);
-    networkCommissioning_updateWiFiNetwork_parametersList.add(
+    networkCommissioning_updateWiFiNetwork_commandParams.add(
         updateWiFiNetwork_credentials_commandParameter);
 
     CommandParameter updateWiFiNetwork_breadcrumb_commandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateWiFiNetwork_parametersList.add(
+    networkCommissioning_updateWiFiNetwork_commandParams.add(
         updateWiFiNetwork_breadcrumb_commandParameter);
 
     CommandParameter updateWiFiNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_updateWiFiNetwork_parametersList.add(
+    networkCommissioning_updateWiFiNetwork_commandParams.add(
         updateWiFiNetwork_timeoutMs_commandParameter);
 
-    networkCommissioning_updateWiFiNetwork_commandInfo.parameters =
-        networkCommissioning_updateWiFiNetwork_parametersList;
-    networkCommissioning_clusterInfo.commands.add(
-        networkCommissioning_updateWiFiNetwork_commandInfo);
-    clusterInfoMapping.put("networkCommissioning", networkCommissioning_clusterInfo);
-    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
-        new ClusterInfo("otaSoftwareUpdateProvider");
-    List<CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_parametersList =
+    // Populate commands
+    CommandInfo networkCommissioning_updateWiFiNetwork_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            networkCommissioning_updateWiFiNetwork_commandParams);
+    networkCommissioning_ClusterCommandInfo.put(
+        "updateWiFiNetwork", networkCommissioning_updateWiFiNetwork_CommandInfo);
+    // Populate cluster
+    ClusterInfo networkCommissioning_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
+            networkCommissioning_ClusterCommandInfo);
+    clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
         new ArrayList<>();
-    CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo = new CommandInfo();
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.name = "applyUpdateRequest";
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.callbackClass =
-        ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter applyUpdateRequest_updateToken_commandParameter =
         new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_applyUpdateRequest_parametersList.add(
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.add(
         applyUpdateRequest_updateToken_commandParameter);
 
     CommandParameter applyUpdateRequest_newVersion_commandParameter =
         new CommandParameter("newVersion", long.class);
-    otaSoftwareUpdateProvider_applyUpdateRequest_parametersList.add(
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.add(
         applyUpdateRequest_newVersion_commandParameter);
 
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo.parameters =
-        otaSoftwareUpdateProvider_applyUpdateRequest_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(
-        otaSoftwareUpdateProvider_applyUpdateRequest_commandInfo);
-    List<CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList =
+    // Populate commands
+    CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            otaSoftwareUpdateProvider_applyUpdateRequest_commandParams);
+    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
+        "applyUpdateRequest", otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo);
+    List<CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
         new ArrayList<>();
-    CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo = new CommandInfo();
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.name = "notifyUpdateApplied";
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter notifyUpdateApplied_updateToken_commandParameter =
         new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList.add(
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.add(
         notifyUpdateApplied_updateToken_commandParameter);
 
     CommandParameter notifyUpdateApplied_softwareVersion_commandParameter =
         new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList.add(
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.add(
         notifyUpdateApplied_softwareVersion_commandParameter);
 
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo.parameters =
-        otaSoftwareUpdateProvider_notifyUpdateApplied_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(
-        otaSoftwareUpdateProvider_notifyUpdateApplied_commandInfo);
-    List<CommandParameter> otaSoftwareUpdateProvider_queryImage_parametersList = new ArrayList<>();
-    CommandInfo otaSoftwareUpdateProvider_queryImage_commandInfo = new CommandInfo();
-    otaSoftwareUpdateProvider_queryImage_commandInfo.name = "queryImage";
-    otaSoftwareUpdateProvider_queryImage_commandInfo.callbackClass =
-        ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class;
+    // Populate commands
+    CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams);
+    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
+        "notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
+    List<CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter queryImage_vendorId_commandParameter =
         new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_vendorId_commandParameter);
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_vendorId_commandParameter);
 
     CommandParameter queryImage_productId_commandParameter =
         new CommandParameter("productId", int.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_productId_commandParameter);
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_productId_commandParameter);
 
     CommandParameter queryImage_hardwareVersion_commandParameter =
         new CommandParameter("hardwareVersion", int.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_hardwareVersion_commandParameter);
 
     CommandParameter queryImage_softwareVersion_commandParameter =
         new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_softwareVersion_commandParameter);
 
     CommandParameter queryImage_protocolsSupported_commandParameter =
         new CommandParameter("protocolsSupported", int.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_protocolsSupported_commandParameter);
 
     CommandParameter queryImage_location_commandParameter =
         new CommandParameter("location", String.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(queryImage_location_commandParameter);
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_location_commandParameter);
 
     CommandParameter queryImage_requestorCanConsent_commandParameter =
         new CommandParameter("requestorCanConsent", boolean.class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_requestorCanConsent_commandParameter);
 
     CommandParameter queryImage_metadataForProvider_commandParameter =
         new CommandParameter("metadataForProvider", byte[].class);
-    otaSoftwareUpdateProvider_queryImage_parametersList.add(
+    otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_metadataForProvider_commandParameter);
 
-    otaSoftwareUpdateProvider_queryImage_commandInfo.parameters =
-        otaSoftwareUpdateProvider_queryImage_parametersList;
-    otaSoftwareUpdateProvider_clusterInfo.commands.add(
-        otaSoftwareUpdateProvider_queryImage_commandInfo);
-    clusterInfoMapping.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
-    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
-        new ClusterInfo("otaSoftwareUpdateRequestor");
-    List<CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_parametersList =
+    // Populate commands
+    CommandInfo otaSoftwareUpdateProvider_queryImage_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            otaSoftwareUpdateProvider_queryImage_commandParams);
+    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
+        "queryImage", otaSoftwareUpdateProvider_queryImage_CommandInfo);
+    // Populate cluster
+    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
+            otaSoftwareUpdateProvider_ClusterCommandInfo);
+    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
         new ArrayList<>();
-    CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo = new CommandInfo();
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.name = "announceOtaProvider";
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter announceOtaProvider_providerLocation_commandParameter =
         new CommandParameter("providerLocation", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
         announceOtaProvider_providerLocation_commandParameter);
 
     CommandParameter announceOtaProvider_vendorId_commandParameter =
         new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
         announceOtaProvider_vendorId_commandParameter);
 
     CommandParameter announceOtaProvider_announcementReason_commandParameter =
         new CommandParameter("announcementReason", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
         announceOtaProvider_announcementReason_commandParameter);
 
     CommandParameter announceOtaProvider_metadataForNode_commandParameter =
         new CommandParameter("metadataForNode", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_parametersList.add(
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
         announceOtaProvider_metadataForNode_commandParameter);
 
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo.parameters =
-        otaSoftwareUpdateRequestor_announceOtaProvider_parametersList;
-    otaSoftwareUpdateRequestor_clusterInfo.commands.add(
-        otaSoftwareUpdateRequestor_announceOtaProvider_commandInfo);
-    clusterInfoMapping.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
-    ClusterInfo occupancySensing_clusterInfo = new ClusterInfo("occupancySensing");
-    clusterInfoMapping.put("occupancySensing", occupancySensing_clusterInfo);
-    ClusterInfo onOff_clusterInfo = new ClusterInfo("onOff");
-    List<CommandParameter> onOff_off_parametersList = new ArrayList<>();
-    CommandInfo onOff_off_commandInfo = new CommandInfo();
-    onOff_off_commandInfo.name = "off";
-    onOff_off_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    onOff_off_commandInfo.parameters = onOff_off_parametersList;
-    onOff_clusterInfo.commands.add(onOff_off_commandInfo);
-    List<CommandParameter> onOff_offWithEffect_parametersList = new ArrayList<>();
-    CommandInfo onOff_offWithEffect_commandInfo = new CommandInfo();
-    onOff_offWithEffect_commandInfo.name = "offWithEffect";
-    onOff_offWithEffect_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            otaSoftwareUpdateRequestor_announceOtaProvider_commandParams);
+    otaSoftwareUpdateRequestor_ClusterCommandInfo.put(
+        "announceOtaProvider", otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo);
+    // Populate cluster
+    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
+            otaSoftwareUpdateRequestor_ClusterCommandInfo);
+    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
+    Map<String, CommandInfo> occupancySensing_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo occupancySensing_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
+            occupancySensing_ClusterCommandInfo);
+    clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
+    Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> onOff_off_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo onOff_off_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_off_commandParams);
+    onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
+    List<CommandParameter> onOff_offWithEffect_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter offWithEffect_effectId_commandParameter =
         new CommandParameter("effectId", int.class);
-    onOff_offWithEffect_parametersList.add(offWithEffect_effectId_commandParameter);
+    onOff_offWithEffect_commandParams.add(offWithEffect_effectId_commandParameter);
 
     CommandParameter offWithEffect_effectVariant_commandParameter =
         new CommandParameter("effectVariant", int.class);
-    onOff_offWithEffect_parametersList.add(offWithEffect_effectVariant_commandParameter);
-
-    onOff_offWithEffect_commandInfo.parameters = onOff_offWithEffect_parametersList;
-    onOff_clusterInfo.commands.add(onOff_offWithEffect_commandInfo);
-    List<CommandParameter> onOff_on_parametersList = new ArrayList<>();
-    CommandInfo onOff_on_commandInfo = new CommandInfo();
-    onOff_on_commandInfo.name = "on";
-    onOff_on_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    onOff_on_commandInfo.parameters = onOff_on_parametersList;
-    onOff_clusterInfo.commands.add(onOff_on_commandInfo);
-    List<CommandParameter> onOff_onWithRecallGlobalScene_parametersList = new ArrayList<>();
-    CommandInfo onOff_onWithRecallGlobalScene_commandInfo = new CommandInfo();
-    onOff_onWithRecallGlobalScene_commandInfo.name = "onWithRecallGlobalScene";
-    onOff_onWithRecallGlobalScene_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    onOff_onWithRecallGlobalScene_commandInfo.parameters =
-        onOff_onWithRecallGlobalScene_parametersList;
-    onOff_clusterInfo.commands.add(onOff_onWithRecallGlobalScene_commandInfo);
-    List<CommandParameter> onOff_onWithTimedOff_parametersList = new ArrayList<>();
-    CommandInfo onOff_onWithTimedOff_commandInfo = new CommandInfo();
-    onOff_onWithTimedOff_commandInfo.name = "onWithTimedOff";
-    onOff_onWithTimedOff_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    onOff_offWithEffect_commandParams.add(offWithEffect_effectVariant_commandParameter);
+
+    // Populate commands
+    CommandInfo onOff_offWithEffect_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_offWithEffect_commandParams);
+    onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
+    List<CommandParameter> onOff_on_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo onOff_on_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_on_commandParams);
+    onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
+    List<CommandParameter> onOff_onWithRecallGlobalScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo onOff_onWithRecallGlobalScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_onWithRecallGlobalScene_commandParams);
+    onOff_ClusterCommandInfo.put(
+        "onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
+    List<CommandParameter> onOff_onWithTimedOff_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter onWithTimedOff_onOffControl_commandParameter =
         new CommandParameter("onOffControl", int.class);
-    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_onOffControl_commandParameter);
+    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_onOffControl_commandParameter);
 
     CommandParameter onWithTimedOff_onTime_commandParameter =
         new CommandParameter("onTime", int.class);
-    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_onTime_commandParameter);
+    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_onTime_commandParameter);
 
     CommandParameter onWithTimedOff_offWaitTime_commandParameter =
         new CommandParameter("offWaitTime", int.class);
-    onOff_onWithTimedOff_parametersList.add(onWithTimedOff_offWaitTime_commandParameter);
-
-    onOff_onWithTimedOff_commandInfo.parameters = onOff_onWithTimedOff_parametersList;
-    onOff_clusterInfo.commands.add(onOff_onWithTimedOff_commandInfo);
-    List<CommandParameter> onOff_toggle_parametersList = new ArrayList<>();
-    CommandInfo onOff_toggle_commandInfo = new CommandInfo();
-    onOff_toggle_commandInfo.name = "toggle";
-    onOff_toggle_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    onOff_toggle_commandInfo.parameters = onOff_toggle_parametersList;
-    onOff_clusterInfo.commands.add(onOff_toggle_commandInfo);
-    clusterInfoMapping.put("onOff", onOff_clusterInfo);
-    ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo("onOffSwitchConfiguration");
-    clusterInfoMapping.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
-    ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo("operationalCredentials");
-    List<CommandParameter> operationalCredentials_addNOC_parametersList = new ArrayList<>();
-    CommandInfo operationalCredentials_addNOC_commandInfo = new CommandInfo();
-    operationalCredentials_addNOC_commandInfo.name = "addNOC";
-    operationalCredentials_addNOC_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_offWaitTime_commandParameter);
+
+    // Populate commands
+    CommandInfo onOff_onWithTimedOff_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_onWithTimedOff_commandParams);
+    onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
+    List<CommandParameter> onOff_toggle_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo onOff_toggle_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            onOff_toggle_commandParams);
+    onOff_ClusterCommandInfo.put("toggle", onOff_toggle_CommandInfo);
+    // Populate cluster
+    ClusterInfo onOff_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId),
+            onOff_ClusterCommandInfo);
+    clusterMap.put("onOff", onOff_clusterInfo);
+    Map<String, CommandInfo> onOffSwitchConfiguration_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo onOffSwitchConfiguration_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
+            onOffSwitchConfiguration_ClusterCommandInfo);
+    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
+    Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> operationalCredentials_addNOC_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter addNOC_NOCValue_commandParameter =
         new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_addNOC_parametersList.add(addNOC_NOCValue_commandParameter);
+    operationalCredentials_addNOC_commandParams.add(addNOC_NOCValue_commandParameter);
 
     CommandParameter addNOC_ICACValue_commandParameter =
         new CommandParameter("ICACValue", byte[].class);
-    operationalCredentials_addNOC_parametersList.add(addNOC_ICACValue_commandParameter);
+    operationalCredentials_addNOC_commandParams.add(addNOC_ICACValue_commandParameter);
 
     CommandParameter addNOC_IPKValue_commandParameter =
         new CommandParameter("IPKValue", byte[].class);
-    operationalCredentials_addNOC_parametersList.add(addNOC_IPKValue_commandParameter);
+    operationalCredentials_addNOC_commandParams.add(addNOC_IPKValue_commandParameter);
 
     CommandParameter addNOC_caseAdminNode_commandParameter =
         new CommandParameter("caseAdminNode", long.class);
-    operationalCredentials_addNOC_parametersList.add(addNOC_caseAdminNode_commandParameter);
+    operationalCredentials_addNOC_commandParams.add(addNOC_caseAdminNode_commandParameter);
 
     CommandParameter addNOC_adminVendorId_commandParameter =
         new CommandParameter("adminVendorId", int.class);
-    operationalCredentials_addNOC_parametersList.add(addNOC_adminVendorId_commandParameter);
+    operationalCredentials_addNOC_commandParams.add(addNOC_adminVendorId_commandParameter);
 
-    operationalCredentials_addNOC_commandInfo.parameters =
-        operationalCredentials_addNOC_parametersList;
-    operationalCredentials_clusterInfo.commands.add(operationalCredentials_addNOC_commandInfo);
-    List<CommandParameter> operationalCredentials_addTrustedRootCertificate_parametersList =
+    // Populate commands
+    CommandInfo operationalCredentials_addNOC_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_addNOC_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "addNOC", operationalCredentials_addNOC_CommandInfo);
+    List<CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
         new ArrayList<>();
-    CommandInfo operationalCredentials_addTrustedRootCertificate_commandInfo = new CommandInfo();
-    operationalCredentials_addTrustedRootCertificate_commandInfo.name = "addTrustedRootCertificate";
-    operationalCredentials_addTrustedRootCertificate_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter addTrustedRootCertificate_rootCertificate_commandParameter =
         new CommandParameter("rootCertificate", byte[].class);
-    operationalCredentials_addTrustedRootCertificate_parametersList.add(
+    operationalCredentials_addTrustedRootCertificate_commandParams.add(
         addTrustedRootCertificate_rootCertificate_commandParameter);
 
-    operationalCredentials_addTrustedRootCertificate_commandInfo.parameters =
-        operationalCredentials_addTrustedRootCertificate_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_addTrustedRootCertificate_commandInfo);
-    List<CommandParameter> operationalCredentials_attestationRequest_parametersList =
+    // Populate commands
+    CommandInfo operationalCredentials_addTrustedRootCertificate_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_addTrustedRootCertificate_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
+    List<CommandParameter> operationalCredentials_attestationRequest_commandParams =
         new ArrayList<>();
-    CommandInfo operationalCredentials_attestationRequest_commandInfo = new CommandInfo();
-    operationalCredentials_attestationRequest_commandInfo.name = "attestationRequest";
-    operationalCredentials_attestationRequest_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter attestationRequest_attestationNonce_commandParameter =
         new CommandParameter("attestationNonce", byte[].class);
-    operationalCredentials_attestationRequest_parametersList.add(
+    operationalCredentials_attestationRequest_commandParams.add(
         attestationRequest_attestationNonce_commandParameter);
 
-    operationalCredentials_attestationRequest_commandInfo.parameters =
-        operationalCredentials_attestationRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_attestationRequest_commandInfo);
-    List<CommandParameter> operationalCredentials_certificateChainRequest_parametersList =
+    // Populate commands
+    CommandInfo operationalCredentials_attestationRequest_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_attestationRequest_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "attestationRequest", operationalCredentials_attestationRequest_CommandInfo);
+    List<CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
         new ArrayList<>();
-    CommandInfo operationalCredentials_certificateChainRequest_commandInfo = new CommandInfo();
-    operationalCredentials_certificateChainRequest_commandInfo.name = "certificateChainRequest";
-    operationalCredentials_certificateChainRequest_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter certificateChainRequest_certificateType_commandParameter =
         new CommandParameter("certificateType", int.class);
-    operationalCredentials_certificateChainRequest_parametersList.add(
+    operationalCredentials_certificateChainRequest_commandParams.add(
         certificateChainRequest_certificateType_commandParameter);
 
-    operationalCredentials_certificateChainRequest_commandInfo.parameters =
-        operationalCredentials_certificateChainRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_certificateChainRequest_commandInfo);
-    List<CommandParameter> operationalCredentials_opCSRRequest_parametersList = new ArrayList<>();
-    CommandInfo operationalCredentials_opCSRRequest_commandInfo = new CommandInfo();
-    operationalCredentials_opCSRRequest_commandInfo.name = "opCSRRequest";
-    operationalCredentials_opCSRRequest_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class;
+    // Populate commands
+    CommandInfo operationalCredentials_certificateChainRequest_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_certificateChainRequest_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "certificateChainRequest", operationalCredentials_certificateChainRequest_CommandInfo);
+    List<CommandParameter> operationalCredentials_opCSRRequest_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter opCSRRequest_CSRNonce_commandParameter =
         new CommandParameter("CSRNonce", byte[].class);
-    operationalCredentials_opCSRRequest_parametersList.add(opCSRRequest_CSRNonce_commandParameter);
-
-    operationalCredentials_opCSRRequest_commandInfo.parameters =
-        operationalCredentials_opCSRRequest_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_opCSRRequest_commandInfo);
-    List<CommandParameter> operationalCredentials_removeFabric_parametersList = new ArrayList<>();
-    CommandInfo operationalCredentials_removeFabric_commandInfo = new CommandInfo();
-    operationalCredentials_removeFabric_commandInfo.name = "removeFabric";
-    operationalCredentials_removeFabric_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    operationalCredentials_opCSRRequest_commandParams.add(opCSRRequest_CSRNonce_commandParameter);
+
+    // Populate commands
+    CommandInfo operationalCredentials_opCSRRequest_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_opCSRRequest_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "opCSRRequest", operationalCredentials_opCSRRequest_CommandInfo);
+    List<CommandParameter> operationalCredentials_removeFabric_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter removeFabric_fabricIndex_commandParameter =
         new CommandParameter("fabricIndex", int.class);
-    operationalCredentials_removeFabric_parametersList.add(
+    operationalCredentials_removeFabric_commandParams.add(
         removeFabric_fabricIndex_commandParameter);
 
-    operationalCredentials_removeFabric_commandInfo.parameters =
-        operationalCredentials_removeFabric_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_removeFabric_commandInfo);
-    List<CommandParameter> operationalCredentials_removeTrustedRootCertificate_parametersList =
+    // Populate commands
+    CommandInfo operationalCredentials_removeFabric_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_removeFabric_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "removeFabric", operationalCredentials_removeFabric_CommandInfo);
+    List<CommandParameter> operationalCredentials_removeTrustedRootCertificate_commandParams =
         new ArrayList<>();
-    CommandInfo operationalCredentials_removeTrustedRootCertificate_commandInfo = new CommandInfo();
-    operationalCredentials_removeTrustedRootCertificate_commandInfo.name =
-        "removeTrustedRootCertificate";
-    operationalCredentials_removeTrustedRootCertificate_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter removeTrustedRootCertificate_trustedRootIdentifier_commandParameter =
         new CommandParameter("trustedRootIdentifier", byte[].class);
-    operationalCredentials_removeTrustedRootCertificate_parametersList.add(
+    operationalCredentials_removeTrustedRootCertificate_commandParams.add(
         removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
 
-    operationalCredentials_removeTrustedRootCertificate_commandInfo.parameters =
-        operationalCredentials_removeTrustedRootCertificate_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_removeTrustedRootCertificate_commandInfo);
-    List<CommandParameter> operationalCredentials_updateFabricLabel_parametersList =
+    // Populate commands
+    CommandInfo operationalCredentials_removeTrustedRootCertificate_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_removeTrustedRootCertificate_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "removeTrustedRootCertificate",
+        operationalCredentials_removeTrustedRootCertificate_CommandInfo);
+    List<CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
         new ArrayList<>();
-    CommandInfo operationalCredentials_updateFabricLabel_commandInfo = new CommandInfo();
-    operationalCredentials_updateFabricLabel_commandInfo.name = "updateFabricLabel";
-    operationalCredentials_updateFabricLabel_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    // TODO: fill out parameter types
+
     CommandParameter updateFabricLabel_label_commandParameter =
         new CommandParameter("label", String.class);
-    operationalCredentials_updateFabricLabel_parametersList.add(
+    operationalCredentials_updateFabricLabel_commandParams.add(
         updateFabricLabel_label_commandParameter);
 
-    operationalCredentials_updateFabricLabel_commandInfo.parameters =
-        operationalCredentials_updateFabricLabel_parametersList;
-    operationalCredentials_clusterInfo.commands.add(
-        operationalCredentials_updateFabricLabel_commandInfo);
-    List<CommandParameter> operationalCredentials_updateNOC_parametersList = new ArrayList<>();
-    CommandInfo operationalCredentials_updateNOC_commandInfo = new CommandInfo();
-    operationalCredentials_updateNOC_commandInfo.name = "updateNOC";
-    operationalCredentials_updateNOC_commandInfo.callbackClass =
-        ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class;
+    // Populate commands
+    CommandInfo operationalCredentials_updateFabricLabel_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_updateFabricLabel_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "updateFabricLabel", operationalCredentials_updateFabricLabel_CommandInfo);
+    List<CommandParameter> operationalCredentials_updateNOC_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter updateNOC_NOCValue_commandParameter =
         new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_updateNOC_parametersList.add(updateNOC_NOCValue_commandParameter);
+    operationalCredentials_updateNOC_commandParams.add(updateNOC_NOCValue_commandParameter);
 
     CommandParameter updateNOC_ICACValue_commandParameter =
         new CommandParameter("ICACValue", byte[].class);
-    operationalCredentials_updateNOC_parametersList.add(updateNOC_ICACValue_commandParameter);
-
-    operationalCredentials_updateNOC_commandInfo.parameters =
-        operationalCredentials_updateNOC_parametersList;
-    operationalCredentials_clusterInfo.commands.add(operationalCredentials_updateNOC_commandInfo);
-    clusterInfoMapping.put("operationalCredentials", operationalCredentials_clusterInfo);
-    ClusterInfo powerSource_clusterInfo = new ClusterInfo("powerSource");
-    clusterInfoMapping.put("powerSource", powerSource_clusterInfo);
-    ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo("pressureMeasurement");
-    clusterInfoMapping.put("pressureMeasurement", pressureMeasurement_clusterInfo);
+    operationalCredentials_updateNOC_commandParams.add(updateNOC_ICACValue_commandParameter);
+
+    // Populate commands
+    CommandInfo operationalCredentials_updateNOC_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            operationalCredentials_updateNOC_commandParams);
+    operationalCredentials_ClusterCommandInfo.put(
+        "updateNOC", operationalCredentials_updateNOC_CommandInfo);
+    // Populate cluster
+    ClusterInfo operationalCredentials_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
+            operationalCredentials_ClusterCommandInfo);
+    clusterMap.put("operationalCredentials", operationalCredentials_clusterInfo);
+    Map<String, CommandInfo> powerSource_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo powerSource_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
+            powerSource_ClusterCommandInfo);
+    clusterMap.put("powerSource", powerSource_clusterInfo);
+    Map<String, CommandInfo> pressureMeasurement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo pressureMeasurement_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId),
+            pressureMeasurement_ClusterCommandInfo);
+    clusterMap.put("pressureMeasurement", pressureMeasurement_clusterInfo);
+    Map<String, CommandInfo> pumpConfigurationAndControl_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
     ClusterInfo pumpConfigurationAndControl_clusterInfo =
-        new ClusterInfo("pumpConfigurationAndControl");
-    clusterInfoMapping.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
+            pumpConfigurationAndControl_ClusterCommandInfo);
+    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
+    Map<String, CommandInfo> relativeHumidityMeasurement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
     ClusterInfo relativeHumidityMeasurement_clusterInfo =
-        new ClusterInfo("relativeHumidityMeasurement");
-    clusterInfoMapping.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
-    ClusterInfo scenes_clusterInfo = new ClusterInfo("scenes");
-    List<CommandParameter> scenes_addScene_parametersList = new ArrayList<>();
-    CommandInfo scenes_addScene_commandInfo = new CommandInfo();
-    scenes_addScene_commandInfo.name = "addScene";
-    scenes_addScene_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.AddSceneResponseCallback.class;
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId),
+            relativeHumidityMeasurement_ClusterCommandInfo);
+    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
+    Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> scenes_addScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter addScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    scenes_addScene_parametersList.add(addScene_groupId_commandParameter);
+    scenes_addScene_commandParams.add(addScene_groupId_commandParameter);
 
     CommandParameter addScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    scenes_addScene_parametersList.add(addScene_sceneId_commandParameter);
+    scenes_addScene_commandParams.add(addScene_sceneId_commandParameter);
 
     CommandParameter addScene_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    scenes_addScene_parametersList.add(addScene_transitionTime_commandParameter);
+    scenes_addScene_commandParams.add(addScene_transitionTime_commandParameter);
 
     CommandParameter addScene_sceneName_commandParameter =
         new CommandParameter("sceneName", String.class);
-    scenes_addScene_parametersList.add(addScene_sceneName_commandParameter);
+    scenes_addScene_commandParams.add(addScene_sceneName_commandParameter);
 
     CommandParameter addScene_clusterId_commandParameter =
         new CommandParameter("clusterId", long.class);
-    scenes_addScene_parametersList.add(addScene_clusterId_commandParameter);
+    scenes_addScene_commandParams.add(addScene_clusterId_commandParameter);
 
     CommandParameter addScene_length_commandParameter = new CommandParameter("length", int.class);
-    scenes_addScene_parametersList.add(addScene_length_commandParameter);
+    scenes_addScene_commandParams.add(addScene_length_commandParameter);
 
     CommandParameter addScene_value_commandParameter = new CommandParameter("value", int.class);
-    scenes_addScene_parametersList.add(addScene_value_commandParameter);
-
-    scenes_addScene_commandInfo.parameters = scenes_addScene_parametersList;
-    scenes_clusterInfo.commands.add(scenes_addScene_commandInfo);
-    List<CommandParameter> scenes_getSceneMembership_parametersList = new ArrayList<>();
-    CommandInfo scenes_getSceneMembership_commandInfo = new CommandInfo();
-    scenes_getSceneMembership_commandInfo.name = "getSceneMembership";
-    scenes_getSceneMembership_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class;
+    scenes_addScene_commandParams.add(addScene_value_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_addScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_addScene_commandParams);
+    scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
+    List<CommandParameter> scenes_getSceneMembership_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getSceneMembership_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_getSceneMembership_parametersList.add(getSceneMembership_groupId_commandParameter);
-
-    scenes_getSceneMembership_commandInfo.parameters = scenes_getSceneMembership_parametersList;
-    scenes_clusterInfo.commands.add(scenes_getSceneMembership_commandInfo);
-    List<CommandParameter> scenes_recallScene_parametersList = new ArrayList<>();
-    CommandInfo scenes_recallScene_commandInfo = new CommandInfo();
-    scenes_recallScene_commandInfo.name = "recallScene";
-    scenes_recallScene_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    scenes_getSceneMembership_commandParams.add(getSceneMembership_groupId_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_getSceneMembership_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_getSceneMembership_commandParams);
+    scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
+    List<CommandParameter> scenes_recallScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter recallScene_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_recallScene_parametersList.add(recallScene_groupId_commandParameter);
+    scenes_recallScene_commandParams.add(recallScene_groupId_commandParameter);
 
     CommandParameter recallScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_recallScene_parametersList.add(recallScene_sceneId_commandParameter);
+    scenes_recallScene_commandParams.add(recallScene_sceneId_commandParameter);
 
     CommandParameter recallScene_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
-    scenes_recallScene_parametersList.add(recallScene_transitionTime_commandParameter);
-
-    scenes_recallScene_commandInfo.parameters = scenes_recallScene_parametersList;
-    scenes_clusterInfo.commands.add(scenes_recallScene_commandInfo);
-    List<CommandParameter> scenes_removeAllScenes_parametersList = new ArrayList<>();
-    CommandInfo scenes_removeAllScenes_commandInfo = new CommandInfo();
-    scenes_removeAllScenes_commandInfo.name = "removeAllScenes";
-    scenes_removeAllScenes_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class;
+    scenes_recallScene_commandParams.add(recallScene_transitionTime_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_recallScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_recallScene_commandParams);
+    scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
+    List<CommandParameter> scenes_removeAllScenes_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter removeAllScenes_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_removeAllScenes_parametersList.add(removeAllScenes_groupId_commandParameter);
-
-    scenes_removeAllScenes_commandInfo.parameters = scenes_removeAllScenes_parametersList;
-    scenes_clusterInfo.commands.add(scenes_removeAllScenes_commandInfo);
-    List<CommandParameter> scenes_removeScene_parametersList = new ArrayList<>();
-    CommandInfo scenes_removeScene_commandInfo = new CommandInfo();
-    scenes_removeScene_commandInfo.name = "removeScene";
-    scenes_removeScene_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class;
+    scenes_removeAllScenes_commandParams.add(removeAllScenes_groupId_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_removeAllScenes_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_removeAllScenes_commandParams);
+    scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
+    List<CommandParameter> scenes_removeScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter removeScene_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_removeScene_parametersList.add(removeScene_groupId_commandParameter);
+    scenes_removeScene_commandParams.add(removeScene_groupId_commandParameter);
 
     CommandParameter removeScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_removeScene_parametersList.add(removeScene_sceneId_commandParameter);
-
-    scenes_removeScene_commandInfo.parameters = scenes_removeScene_parametersList;
-    scenes_clusterInfo.commands.add(scenes_removeScene_commandInfo);
-    List<CommandParameter> scenes_storeScene_parametersList = new ArrayList<>();
-    CommandInfo scenes_storeScene_commandInfo = new CommandInfo();
-    scenes_storeScene_commandInfo.name = "storeScene";
-    scenes_storeScene_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.StoreSceneResponseCallback.class;
+    scenes_removeScene_commandParams.add(removeScene_sceneId_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_removeScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_removeScene_commandParams);
+    scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
+    List<CommandParameter> scenes_storeScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter storeScene_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_storeScene_parametersList.add(storeScene_groupId_commandParameter);
+    scenes_storeScene_commandParams.add(storeScene_groupId_commandParameter);
 
     CommandParameter storeScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_storeScene_parametersList.add(storeScene_sceneId_commandParameter);
-
-    scenes_storeScene_commandInfo.parameters = scenes_storeScene_parametersList;
-    scenes_clusterInfo.commands.add(scenes_storeScene_commandInfo);
-    List<CommandParameter> scenes_viewScene_parametersList = new ArrayList<>();
-    CommandInfo scenes_viewScene_commandInfo = new CommandInfo();
-    scenes_viewScene_commandInfo.name = "viewScene";
-    scenes_viewScene_commandInfo.callbackClass =
-        ChipClusters.ScenesCluster.ViewSceneResponseCallback.class;
+    scenes_storeScene_commandParams.add(storeScene_sceneId_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_storeScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_storeScene_commandParams);
+    scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
+    List<CommandParameter> scenes_viewScene_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter viewScene_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_viewScene_parametersList.add(viewScene_groupId_commandParameter);
+    scenes_viewScene_commandParams.add(viewScene_groupId_commandParameter);
 
     CommandParameter viewScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_viewScene_parametersList.add(viewScene_sceneId_commandParameter);
-
-    scenes_viewScene_commandInfo.parameters = scenes_viewScene_parametersList;
-    scenes_clusterInfo.commands.add(scenes_viewScene_commandInfo);
-    clusterInfoMapping.put("scenes", scenes_clusterInfo);
-    ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo("softwareDiagnostics");
-    List<CommandParameter> softwareDiagnostics_resetWatermarks_parametersList = new ArrayList<>();
-    CommandInfo softwareDiagnostics_resetWatermarks_commandInfo = new CommandInfo();
-    softwareDiagnostics_resetWatermarks_commandInfo.name = "resetWatermarks";
-    softwareDiagnostics_resetWatermarks_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    softwareDiagnostics_resetWatermarks_commandInfo.parameters =
-        softwareDiagnostics_resetWatermarks_parametersList;
-    softwareDiagnostics_clusterInfo.commands.add(softwareDiagnostics_resetWatermarks_commandInfo);
-    clusterInfoMapping.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
-    ClusterInfo switch_clusterInfo = new ClusterInfo("switch");
-    clusterInfoMapping.put("switch", switch_clusterInfo);
-    ClusterInfo tvChannel_clusterInfo = new ClusterInfo("tvChannel");
-    List<CommandParameter> tvChannel_changeChannel_parametersList = new ArrayList<>();
-    CommandInfo tvChannel_changeChannel_commandInfo = new CommandInfo();
-    tvChannel_changeChannel_commandInfo.name = "changeChannel";
-    tvChannel_changeChannel_commandInfo.callbackClass =
-        ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class;
+    scenes_viewScene_commandParams.add(viewScene_sceneId_commandParameter);
+
+    // Populate commands
+    CommandInfo scenes_viewScene_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            scenes_viewScene_commandParams);
+    scenes_ClusterCommandInfo.put("viewScene", scenes_viewScene_CommandInfo);
+    // Populate cluster
+    ClusterInfo scenes_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId),
+            scenes_ClusterCommandInfo);
+    clusterMap.put("scenes", scenes_clusterInfo);
+    Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> softwareDiagnostics_resetWatermarks_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo softwareDiagnostics_resetWatermarks_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            softwareDiagnostics_resetWatermarks_commandParams);
+    softwareDiagnostics_ClusterCommandInfo.put(
+        "resetWatermarks", softwareDiagnostics_resetWatermarks_CommandInfo);
+    // Populate cluster
+    ClusterInfo softwareDiagnostics_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
+            softwareDiagnostics_ClusterCommandInfo);
+    clusterMap.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
+    Map<String, CommandInfo> switch_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo switch_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId),
+            switch_ClusterCommandInfo);
+    clusterMap.put("switch", switch_clusterInfo);
+    Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> tvChannel_changeChannel_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter changeChannel_match_commandParameter =
         new CommandParameter("match", String.class);
-    tvChannel_changeChannel_parametersList.add(changeChannel_match_commandParameter);
-
-    tvChannel_changeChannel_commandInfo.parameters = tvChannel_changeChannel_parametersList;
-    tvChannel_clusterInfo.commands.add(tvChannel_changeChannel_commandInfo);
-    List<CommandParameter> tvChannel_changeChannelByNumber_parametersList = new ArrayList<>();
-    CommandInfo tvChannel_changeChannelByNumber_commandInfo = new CommandInfo();
-    tvChannel_changeChannelByNumber_commandInfo.name = "changeChannelByNumber";
-    tvChannel_changeChannelByNumber_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    tvChannel_changeChannel_commandParams.add(changeChannel_match_commandParameter);
+
+    // Populate commands
+    CommandInfo tvChannel_changeChannel_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            tvChannel_changeChannel_commandParams);
+    tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
+    List<CommandParameter> tvChannel_changeChannelByNumber_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter changeChannelByNumber_majorNumber_commandParameter =
         new CommandParameter("majorNumber", int.class);
-    tvChannel_changeChannelByNumber_parametersList.add(
+    tvChannel_changeChannelByNumber_commandParams.add(
         changeChannelByNumber_majorNumber_commandParameter);
 
     CommandParameter changeChannelByNumber_minorNumber_commandParameter =
         new CommandParameter("minorNumber", int.class);
-    tvChannel_changeChannelByNumber_parametersList.add(
+    tvChannel_changeChannelByNumber_commandParams.add(
         changeChannelByNumber_minorNumber_commandParameter);
 
-    tvChannel_changeChannelByNumber_commandInfo.parameters =
-        tvChannel_changeChannelByNumber_parametersList;
-    tvChannel_clusterInfo.commands.add(tvChannel_changeChannelByNumber_commandInfo);
-    List<CommandParameter> tvChannel_skipChannel_parametersList = new ArrayList<>();
-    CommandInfo tvChannel_skipChannel_commandInfo = new CommandInfo();
-    tvChannel_skipChannel_commandInfo.name = "skipChannel";
-    tvChannel_skipChannel_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo tvChannel_changeChannelByNumber_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            tvChannel_changeChannelByNumber_commandParams);
+    tvChannel_ClusterCommandInfo.put(
+        "changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
+    List<CommandParameter> tvChannel_skipChannel_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter skipChannel_count_commandParameter = new CommandParameter("count", int.class);
-    tvChannel_skipChannel_parametersList.add(skipChannel_count_commandParameter);
-
-    tvChannel_skipChannel_commandInfo.parameters = tvChannel_skipChannel_parametersList;
-    tvChannel_clusterInfo.commands.add(tvChannel_skipChannel_commandInfo);
-    clusterInfoMapping.put("tvChannel", tvChannel_clusterInfo);
-    ClusterInfo targetNavigator_clusterInfo = new ClusterInfo("targetNavigator");
-    List<CommandParameter> targetNavigator_navigateTarget_parametersList = new ArrayList<>();
-    CommandInfo targetNavigator_navigateTarget_commandInfo = new CommandInfo();
-    targetNavigator_navigateTarget_commandInfo.name = "navigateTarget";
-    targetNavigator_navigateTarget_commandInfo.callbackClass =
-        ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class;
+    tvChannel_skipChannel_commandParams.add(skipChannel_count_commandParameter);
+
+    // Populate commands
+    CommandInfo tvChannel_skipChannel_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            tvChannel_skipChannel_commandParams);
+    tvChannel_ClusterCommandInfo.put("skipChannel", tvChannel_skipChannel_CommandInfo);
+    // Populate cluster
+    ClusterInfo tvChannel_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId),
+            tvChannel_ClusterCommandInfo);
+    clusterMap.put("tvChannel", tvChannel_clusterInfo);
+    Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> targetNavigator_navigateTarget_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter navigateTarget_target_commandParameter =
         new CommandParameter("target", int.class);
-    targetNavigator_navigateTarget_parametersList.add(navigateTarget_target_commandParameter);
+    targetNavigator_navigateTarget_commandParams.add(navigateTarget_target_commandParameter);
 
     CommandParameter navigateTarget_data_commandParameter =
         new CommandParameter("data", String.class);
-    targetNavigator_navigateTarget_parametersList.add(navigateTarget_data_commandParameter);
-
-    targetNavigator_navigateTarget_commandInfo.parameters =
-        targetNavigator_navigateTarget_parametersList;
-    targetNavigator_clusterInfo.commands.add(targetNavigator_navigateTarget_commandInfo);
-    clusterInfoMapping.put("targetNavigator", targetNavigator_clusterInfo);
-    ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo("temperatureMeasurement");
-    clusterInfoMapping.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
-    ClusterInfo testCluster_clusterInfo = new ClusterInfo("testCluster");
-    List<CommandParameter> testCluster_test_parametersList = new ArrayList<>();
-    CommandInfo testCluster_test_commandInfo = new CommandInfo();
-    testCluster_test_commandInfo.name = "test";
-    testCluster_test_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    testCluster_test_commandInfo.parameters = testCluster_test_parametersList;
-    testCluster_clusterInfo.commands.add(testCluster_test_commandInfo);
-    List<CommandParameter> testCluster_testAddArguments_parametersList = new ArrayList<>();
-    CommandInfo testCluster_testAddArguments_commandInfo = new CommandInfo();
-    testCluster_testAddArguments_commandInfo.name = "testAddArguments";
-    testCluster_testAddArguments_commandInfo.callbackClass =
-        ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class;
+    targetNavigator_navigateTarget_commandParams.add(navigateTarget_data_commandParameter);
+
+    // Populate commands
+    CommandInfo targetNavigator_navigateTarget_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            targetNavigator_navigateTarget_commandParams);
+    targetNavigator_ClusterCommandInfo.put(
+        "navigateTarget", targetNavigator_navigateTarget_CommandInfo);
+    // Populate cluster
+    ClusterInfo targetNavigator_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId),
+            targetNavigator_ClusterCommandInfo);
+    clusterMap.put("targetNavigator", targetNavigator_clusterInfo);
+    Map<String, CommandInfo> temperatureMeasurement_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo temperatureMeasurement_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
+            temperatureMeasurement_ClusterCommandInfo);
+    clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
+    Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> testCluster_test_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo testCluster_test_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testCluster_test_commandParams);
+    testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
+    List<CommandParameter> testCluster_testAddArguments_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter testAddArguments_arg1_commandParameter =
         new CommandParameter("arg1", int.class);
-    testCluster_testAddArguments_parametersList.add(testAddArguments_arg1_commandParameter);
+    testCluster_testAddArguments_commandParams.add(testAddArguments_arg1_commandParameter);
 
     CommandParameter testAddArguments_arg2_commandParameter =
         new CommandParameter("arg2", int.class);
-    testCluster_testAddArguments_parametersList.add(testAddArguments_arg2_commandParameter);
-
-    testCluster_testAddArguments_commandInfo.parameters =
-        testCluster_testAddArguments_parametersList;
-    testCluster_clusterInfo.commands.add(testCluster_testAddArguments_commandInfo);
-    List<CommandParameter> testCluster_testNotHandled_parametersList = new ArrayList<>();
-    CommandInfo testCluster_testNotHandled_commandInfo = new CommandInfo();
-    testCluster_testNotHandled_commandInfo.name = "testNotHandled";
-    testCluster_testNotHandled_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    testCluster_testNotHandled_commandInfo.parameters = testCluster_testNotHandled_parametersList;
-    testCluster_clusterInfo.commands.add(testCluster_testNotHandled_commandInfo);
-    List<CommandParameter> testCluster_testSpecific_parametersList = new ArrayList<>();
-    CommandInfo testCluster_testSpecific_commandInfo = new CommandInfo();
-    testCluster_testSpecific_commandInfo.name = "testSpecific";
-    testCluster_testSpecific_commandInfo.callbackClass =
-        ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class;
-    testCluster_testSpecific_commandInfo.parameters = testCluster_testSpecific_parametersList;
-    testCluster_clusterInfo.commands.add(testCluster_testSpecific_commandInfo);
-    List<CommandParameter> testCluster_testUnknownCommand_parametersList = new ArrayList<>();
-    CommandInfo testCluster_testUnknownCommand_commandInfo = new CommandInfo();
-    testCluster_testUnknownCommand_commandInfo.name = "testUnknownCommand";
-    testCluster_testUnknownCommand_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    testCluster_testUnknownCommand_commandInfo.parameters =
-        testCluster_testUnknownCommand_parametersList;
-    testCluster_clusterInfo.commands.add(testCluster_testUnknownCommand_commandInfo);
-    clusterInfoMapping.put("testCluster", testCluster_clusterInfo);
-    ClusterInfo thermostat_clusterInfo = new ClusterInfo("thermostat");
-    List<CommandParameter> thermostat_clearWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo thermostat_clearWeeklySchedule_commandInfo = new CommandInfo();
-    thermostat_clearWeeklySchedule_commandInfo.name = "clearWeeklySchedule";
-    thermostat_clearWeeklySchedule_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    thermostat_clearWeeklySchedule_commandInfo.parameters =
-        thermostat_clearWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(thermostat_clearWeeklySchedule_commandInfo);
-    List<CommandParameter> thermostat_getRelayStatusLog_parametersList = new ArrayList<>();
-    CommandInfo thermostat_getRelayStatusLog_commandInfo = new CommandInfo();
-    thermostat_getRelayStatusLog_commandInfo.name = "getRelayStatusLog";
-    thermostat_getRelayStatusLog_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    thermostat_getRelayStatusLog_commandInfo.parameters =
-        thermostat_getRelayStatusLog_parametersList;
-    thermostat_clusterInfo.commands.add(thermostat_getRelayStatusLog_commandInfo);
-    List<CommandParameter> thermostat_getWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo thermostat_getWeeklySchedule_commandInfo = new CommandInfo();
-    thermostat_getWeeklySchedule_commandInfo.name = "getWeeklySchedule";
-    thermostat_getWeeklySchedule_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    testCluster_testAddArguments_commandParams.add(testAddArguments_arg2_commandParameter);
+
+    // Populate commands
+    CommandInfo testCluster_testAddArguments_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testCluster_testAddArguments_commandParams);
+    testCluster_ClusterCommandInfo.put(
+        "testAddArguments", testCluster_testAddArguments_CommandInfo);
+    List<CommandParameter> testCluster_testNotHandled_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo testCluster_testNotHandled_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testCluster_testNotHandled_commandParams);
+    testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
+    List<CommandParameter> testCluster_testSpecific_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo testCluster_testSpecific_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testCluster_testSpecific_commandParams);
+    testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
+    List<CommandParameter> testCluster_testUnknownCommand_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo testCluster_testUnknownCommand_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testCluster_testUnknownCommand_commandParams);
+    testCluster_ClusterCommandInfo.put(
+        "testUnknownCommand", testCluster_testUnknownCommand_CommandInfo);
+    // Populate cluster
+    ClusterInfo testCluster_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
+            testCluster_ClusterCommandInfo);
+    clusterMap.put("testCluster", testCluster_clusterInfo);
+    Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> thermostat_clearWeeklySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo thermostat_clearWeeklySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostat_clearWeeklySchedule_commandParams);
+    thermostat_ClusterCommandInfo.put(
+        "clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
+    List<CommandParameter> thermostat_getRelayStatusLog_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo thermostat_getRelayStatusLog_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostat_getRelayStatusLog_commandParams);
+    thermostat_ClusterCommandInfo.put(
+        "getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
+    List<CommandParameter> thermostat_getWeeklySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter getWeeklySchedule_daysToReturn_commandParameter =
         new CommandParameter("daysToReturn", int.class);
-    thermostat_getWeeklySchedule_parametersList.add(
-        getWeeklySchedule_daysToReturn_commandParameter);
+    thermostat_getWeeklySchedule_commandParams.add(getWeeklySchedule_daysToReturn_commandParameter);
 
     CommandParameter getWeeklySchedule_modeToReturn_commandParameter =
         new CommandParameter("modeToReturn", int.class);
-    thermostat_getWeeklySchedule_parametersList.add(
-        getWeeklySchedule_modeToReturn_commandParameter);
-
-    thermostat_getWeeklySchedule_commandInfo.parameters =
-        thermostat_getWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(thermostat_getWeeklySchedule_commandInfo);
-    List<CommandParameter> thermostat_setWeeklySchedule_parametersList = new ArrayList<>();
-    CommandInfo thermostat_setWeeklySchedule_commandInfo = new CommandInfo();
-    thermostat_setWeeklySchedule_commandInfo.name = "setWeeklySchedule";
-    thermostat_setWeeklySchedule_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    thermostat_getWeeklySchedule_commandParams.add(getWeeklySchedule_modeToReturn_commandParameter);
+
+    // Populate commands
+    CommandInfo thermostat_getWeeklySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostat_getWeeklySchedule_commandParams);
+    thermostat_ClusterCommandInfo.put(
+        "getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
+    List<CommandParameter> thermostat_setWeeklySchedule_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setWeeklySchedule_numberOfTransitionsForSequence_commandParameter =
         new CommandParameter("numberOfTransitionsForSequence", int.class);
-    thermostat_setWeeklySchedule_parametersList.add(
+    thermostat_setWeeklySchedule_commandParams.add(
         setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
 
     CommandParameter setWeeklySchedule_dayOfWeekForSequence_commandParameter =
         new CommandParameter("dayOfWeekForSequence", int.class);
-    thermostat_setWeeklySchedule_parametersList.add(
+    thermostat_setWeeklySchedule_commandParams.add(
         setWeeklySchedule_dayOfWeekForSequence_commandParameter);
 
     CommandParameter setWeeklySchedule_modeForSequence_commandParameter =
         new CommandParameter("modeForSequence", int.class);
-    thermostat_setWeeklySchedule_parametersList.add(
+    thermostat_setWeeklySchedule_commandParams.add(
         setWeeklySchedule_modeForSequence_commandParameter);
 
     CommandParameter setWeeklySchedule_payload_commandParameter =
         new CommandParameter("payload", int.class);
-    thermostat_setWeeklySchedule_parametersList.add(setWeeklySchedule_payload_commandParameter);
-
-    thermostat_setWeeklySchedule_commandInfo.parameters =
-        thermostat_setWeeklySchedule_parametersList;
-    thermostat_clusterInfo.commands.add(thermostat_setWeeklySchedule_commandInfo);
-    List<CommandParameter> thermostat_setpointRaiseLower_parametersList = new ArrayList<>();
-    CommandInfo thermostat_setpointRaiseLower_commandInfo = new CommandInfo();
-    thermostat_setpointRaiseLower_commandInfo.name = "setpointRaiseLower";
-    thermostat_setpointRaiseLower_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    thermostat_setWeeklySchedule_commandParams.add(setWeeklySchedule_payload_commandParameter);
+
+    // Populate commands
+    CommandInfo thermostat_setWeeklySchedule_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostat_setWeeklySchedule_commandParams);
+    thermostat_ClusterCommandInfo.put(
+        "setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
+    List<CommandParameter> thermostat_setpointRaiseLower_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter setpointRaiseLower_mode_commandParameter =
         new CommandParameter("mode", int.class);
-    thermostat_setpointRaiseLower_parametersList.add(setpointRaiseLower_mode_commandParameter);
+    thermostat_setpointRaiseLower_commandParams.add(setpointRaiseLower_mode_commandParameter);
 
     CommandParameter setpointRaiseLower_amount_commandParameter =
         new CommandParameter("amount", int.class);
-    thermostat_setpointRaiseLower_parametersList.add(setpointRaiseLower_amount_commandParameter);
+    thermostat_setpointRaiseLower_commandParams.add(setpointRaiseLower_amount_commandParameter);
 
-    thermostat_setpointRaiseLower_commandInfo.parameters =
-        thermostat_setpointRaiseLower_parametersList;
-    thermostat_clusterInfo.commands.add(thermostat_setpointRaiseLower_commandInfo);
-    clusterInfoMapping.put("thermostat", thermostat_clusterInfo);
+    // Populate commands
+    CommandInfo thermostat_setpointRaiseLower_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            thermostat_setpointRaiseLower_commandParams);
+    thermostat_ClusterCommandInfo.put(
+        "setpointRaiseLower", thermostat_setpointRaiseLower_CommandInfo);
+    // Populate cluster
+    ClusterInfo thermostat_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
+            thermostat_ClusterCommandInfo);
+    clusterMap.put("thermostat", thermostat_clusterInfo);
+    Map<String, CommandInfo> thermostatUserInterfaceConfiguration_ClusterCommandInfo =
+        new HashMap<>();
+    // Populate cluster
     ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo =
-        new ClusterInfo("thermostatUserInterfaceConfiguration");
-    clusterInfoMapping.put(
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
+            thermostatUserInterfaceConfiguration_ClusterCommandInfo);
+    clusterMap.put(
         "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
-    ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo("threadNetworkDiagnostics");
-    List<CommandParameter> threadNetworkDiagnostics_resetCounts_parametersList = new ArrayList<>();
-    CommandInfo threadNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
-    threadNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
-    threadNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    threadNetworkDiagnostics_resetCounts_commandInfo.parameters =
-        threadNetworkDiagnostics_resetCounts_parametersList;
-    threadNetworkDiagnostics_clusterInfo.commands.add(
-        threadNetworkDiagnostics_resetCounts_commandInfo);
-    clusterInfoMapping.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
-    ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo("wakeOnLan");
-    clusterInfoMapping.put("wakeOnLan", wakeOnLan_clusterInfo);
-    ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo("wiFiNetworkDiagnostics");
-    List<CommandParameter> wiFiNetworkDiagnostics_resetCounts_parametersList = new ArrayList<>();
-    CommandInfo wiFiNetworkDiagnostics_resetCounts_commandInfo = new CommandInfo();
-    wiFiNetworkDiagnostics_resetCounts_commandInfo.name = "resetCounts";
-    wiFiNetworkDiagnostics_resetCounts_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    wiFiNetworkDiagnostics_resetCounts_commandInfo.parameters =
-        wiFiNetworkDiagnostics_resetCounts_parametersList;
-    wiFiNetworkDiagnostics_clusterInfo.commands.add(wiFiNetworkDiagnostics_resetCounts_commandInfo);
-    clusterInfoMapping.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
-    ClusterInfo windowCovering_clusterInfo = new ClusterInfo("windowCovering");
-    List<CommandParameter> windowCovering_downOrClose_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_downOrClose_commandInfo = new CommandInfo();
-    windowCovering_downOrClose_commandInfo.name = "downOrClose";
-    windowCovering_downOrClose_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
-    windowCovering_downOrClose_commandInfo.parameters = windowCovering_downOrClose_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_downOrClose_commandInfo);
-    List<CommandParameter> windowCovering_goToLiftPercentage_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_goToLiftPercentage_commandInfo = new CommandInfo();
-    windowCovering_goToLiftPercentage_commandInfo.name = "goToLiftPercentage";
-    windowCovering_goToLiftPercentage_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo threadNetworkDiagnostics_resetCounts_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            threadNetworkDiagnostics_resetCounts_commandParams);
+    threadNetworkDiagnostics_ClusterCommandInfo.put(
+        "resetCounts", threadNetworkDiagnostics_resetCounts_CommandInfo);
+    // Populate cluster
+    ClusterInfo threadNetworkDiagnostics_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
+            threadNetworkDiagnostics_ClusterCommandInfo);
+    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
+    Map<String, CommandInfo> wakeOnLan_ClusterCommandInfo = new HashMap<>();
+    // Populate cluster
+    ClusterInfo wakeOnLan_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
+            wakeOnLan_ClusterCommandInfo);
+    clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
+    Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo wiFiNetworkDiagnostics_resetCounts_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            wiFiNetworkDiagnostics_resetCounts_commandParams);
+    wiFiNetworkDiagnostics_ClusterCommandInfo.put(
+        "resetCounts", wiFiNetworkDiagnostics_resetCounts_CommandInfo);
+    // Populate cluster
+    ClusterInfo wiFiNetworkDiagnostics_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
+            wiFiNetworkDiagnostics_ClusterCommandInfo);
+    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
+    Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
+    List<CommandParameter> windowCovering_downOrClose_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo windowCovering_downOrClose_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_downOrClose_commandParams);
+    windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
+    List<CommandParameter> windowCovering_goToLiftPercentage_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter goToLiftPercentage_liftPercentageValue_commandParameter =
         new CommandParameter("liftPercentageValue", int.class);
-    windowCovering_goToLiftPercentage_parametersList.add(
+    windowCovering_goToLiftPercentage_commandParams.add(
         goToLiftPercentage_liftPercentageValue_commandParameter);
 
     CommandParameter goToLiftPercentage_liftPercent100thsValue_commandParameter =
         new CommandParameter("liftPercent100thsValue", int.class);
-    windowCovering_goToLiftPercentage_parametersList.add(
+    windowCovering_goToLiftPercentage_commandParams.add(
         goToLiftPercentage_liftPercent100thsValue_commandParameter);
 
-    windowCovering_goToLiftPercentage_commandInfo.parameters =
-        windowCovering_goToLiftPercentage_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_goToLiftPercentage_commandInfo);
-    List<CommandParameter> windowCovering_goToLiftValue_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_goToLiftValue_commandInfo = new CommandInfo();
-    windowCovering_goToLiftValue_commandInfo.name = "goToLiftValue";
-    windowCovering_goToLiftValue_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo windowCovering_goToLiftPercentage_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_goToLiftPercentage_commandParams);
+    windowCovering_ClusterCommandInfo.put(
+        "goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
+    List<CommandParameter> windowCovering_goToLiftValue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter goToLiftValue_liftValue_commandParameter =
         new CommandParameter("liftValue", int.class);
-    windowCovering_goToLiftValue_parametersList.add(goToLiftValue_liftValue_commandParameter);
-
-    windowCovering_goToLiftValue_commandInfo.parameters =
-        windowCovering_goToLiftValue_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_goToLiftValue_commandInfo);
-    List<CommandParameter> windowCovering_goToTiltPercentage_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_goToTiltPercentage_commandInfo = new CommandInfo();
-    windowCovering_goToTiltPercentage_commandInfo.name = "goToTiltPercentage";
-    windowCovering_goToTiltPercentage_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    windowCovering_goToLiftValue_commandParams.add(goToLiftValue_liftValue_commandParameter);
+
+    // Populate commands
+    CommandInfo windowCovering_goToLiftValue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_goToLiftValue_commandParams);
+    windowCovering_ClusterCommandInfo.put(
+        "goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
+    List<CommandParameter> windowCovering_goToTiltPercentage_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter goToTiltPercentage_tiltPercentageValue_commandParameter =
         new CommandParameter("tiltPercentageValue", int.class);
-    windowCovering_goToTiltPercentage_parametersList.add(
+    windowCovering_goToTiltPercentage_commandParams.add(
         goToTiltPercentage_tiltPercentageValue_commandParameter);
 
     CommandParameter goToTiltPercentage_tiltPercent100thsValue_commandParameter =
         new CommandParameter("tiltPercent100thsValue", int.class);
-    windowCovering_goToTiltPercentage_parametersList.add(
+    windowCovering_goToTiltPercentage_commandParams.add(
         goToTiltPercentage_tiltPercent100thsValue_commandParameter);
 
-    windowCovering_goToTiltPercentage_commandInfo.parameters =
-        windowCovering_goToTiltPercentage_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_goToTiltPercentage_commandInfo);
-    List<CommandParameter> windowCovering_goToTiltValue_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_goToTiltValue_commandInfo = new CommandInfo();
-    windowCovering_goToTiltValue_commandInfo.name = "goToTiltValue";
-    windowCovering_goToTiltValue_commandInfo.callbackClass =
-        ChipClusters.DefaultClusterCallback.class;
+    // Populate commands
+    CommandInfo windowCovering_goToTiltPercentage_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_goToTiltPercentage_commandParams);
+    windowCovering_ClusterCommandInfo.put(
+        "goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
+    List<CommandParameter> windowCovering_goToTiltValue_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
     CommandParameter goToTiltValue_tiltValue_commandParameter =
         new CommandParameter("tiltValue", int.class);
-    windowCovering_goToTiltValue_parametersList.add(goToTiltValue_tiltValue_commandParameter);
+    windowCovering_goToTiltValue_commandParams.add(goToTiltValue_tiltValue_commandParameter);
 
+<<<<<<< HEAD
     windowCovering_goToTiltValue_commandInfo.parameters =
         windowCovering_goToTiltValue_parametersList;
     windowCovering_clusterInfo.commands.add(windowCovering_goToTiltValue_commandInfo);
@@ -10135,5 +11186,48 @@ public Map<String, ClusterInfo> getClusterMap() {
     clusterInfoMapping.put("windowCovering", windowCovering_clusterInfo);
     return clusterInfoMapping;
 >>>>>>> a4fd0282e (no error code generation)
+=======
+    // Populate commands
+    CommandInfo windowCovering_goToTiltValue_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_goToTiltValue_commandParams);
+    windowCovering_ClusterCommandInfo.put(
+        "goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
+    List<CommandParameter> windowCovering_stopMotion_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo windowCovering_stopMotion_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_stopMotion_commandParams);
+    windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
+    List<CommandParameter> windowCovering_upOrOpen_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    // Populate commands
+    CommandInfo windowCovering_upOrOpen_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              // TODO: expose index in template helper
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            windowCovering_upOrOpen_commandParams);
+    windowCovering_ClusterCommandInfo.put("upOrOpen", windowCovering_upOrOpen_CommandInfo);
+    // Populate cluster
+    ClusterInfo windowCovering_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
+            windowCovering_ClusterCommandInfo);
+    clusterMap.put("windowCovering", windowCovering_clusterInfo);
+    return clusterMap;
+>>>>>>> 2d2bbd2e1 (new design solution)
   }
 }

From a45351b4cefc9512859af14bdbdf7f0750ff0eb2 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Fri, 15 Oct 2021 22:56:14 -0400
Subject: [PATCH 05/38] need to wait for cast-helper

---
 .../src/chip/clusterinfo/CommandInfo.java     |    10 +-
 .../java/templates/ClusterInfo-java.zapt      |    63 +-
 .../java/zap-generated/CHIPClusters-JNI.cpp   | 30146 +++++++---------
 .../chip/devicecontroller/ChipClusters.java   |  7955 ++--
 .../devicecontroller/ClusterInfoMapping.java  |  3742 +-
 5 files changed, 20868 insertions(+), 21048 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 4e724cb74fc4de..6fb1295ce9b480 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -70,7 +70,7 @@ >>>>>>> a4fd0282e (no error code generation)
 public class CommandInfo {
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
-  private List<CommandParameter> commandParameters;
+  private Map<String, CommandParameter> commandParameters;
 
 <<<<<<< HEAD
   public String name;
@@ -87,7 +87,7 @@ >>>>>>> a4fd0282e (no error code generation)
 =======
 
   public CommandInfo(ClusterCommandFunction commandFunction,
-      Supplier<DelegatedClusterCallback> commandCallbackSupplier, List<CommandParameter> commandParameters) {
+      Supplier<DelegatedClusterCallback> commandCallbackSupplier, Map<String, CommandParameter> commandParameters) {
     this.commandFunction = commandFunction;
     this.commandCallbackSupplier = commandCallbackSupplier;
     this.commandParameters = commandParameters;
@@ -101,13 +101,13 @@ public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
     return commandCallbackSupplier;
   }
 
-  public List<CommandParameter> getCommandParameters() {
+  public Map<String, CommandParameter> getCommandParameters() {
     return commandParameters;
   }
 
   @FunctionalInterface
-  interface ClusterCommandFunction {
-    void invokeCommand(BaseChipCluster cluster, Object callback, List<Object> commandArguments);
+  public interface ClusterCommandFunction {
+    void invokeCommand(BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
 }
 >>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 2c36e143a3934f..aa4dbed132c093 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -191,34 +191,75 @@ public class ClusterInfoMapping {
      {{#chip_client_clusters}}
      Map<String, CommandInfo> {{asLowerCamelCase name}}_ClusterCommandInfo = new HashMap<>();
      {{#chip_cluster_commands}}
-           List<CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams = new ArrayList<>();
+           Map<String, CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams = new HashMap<String, CommandParameter>();
            // TODO: fill out parameter types
            {{#if (zcl_command_arguments_count this.id)}}
                {{#if hasSpecificResponse}}
-
+                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
                {{else}}
-
+                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
                {{#chip_cluster_command_arguments}}
-                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_commandParams.add({{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
+                 CommandParameter {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_commandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
                  {{#not_last}} {{/not_last}}
                {{/chip_cluster_command_arguments}}
            {{else}}
-             {{#if hasSpecificResponse}}
-
-             {{else}}
-
-             {{/if}}
+               {{#if hasSpecificResponse}}
+                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+               {{else}}
+                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+               {{/if}}
            {{/if}}
            // Populate commands
+           {{#if hasSpecificResponse}}
+           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
+                           .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
+                           {{#chip_cluster_command_arguments}}
+                           ,
+                              {{#chip_client_clusters}}
+                              {{#chip_cluster_commands}}
+                              {{#chip_cluster_command_arguments}}
+
+                              {{asJavaBoxedType type}}
+
+                              {{/chip_cluster_command_arguments}}
+                              {{/chip_cluster_commands}}
+                              {{/chip_client_clusters}}
+
+                            commandArguments.get("{{asLowerCamelCase label}}")
+                       {{/chip_cluster_command_arguments}}
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams
+           );
+           {{else}}
            CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo = new CommandInfo(
                    (cluster, callback, commandArguments) -> {
-                     // TODO: expose index in template helper
+                       ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
+                          .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
+                          {{#chip_cluster_command_arguments}}
+                          ,
+                             {{#chip_client_clusters}}
+                             {{#chip_cluster_commands}}
+                             {{#chip_cluster_command_arguments}}
+
+                             {{asJavaBoxedType type}}
+
+                             {{/chip_cluster_command_arguments}}
+                             {{/chip_cluster_commands}}
+                             {{/chip_client_clusters}}
+                           commandArguments.get("{{asLowerCamelCase label}}")
+                {{/chip_cluster_command_arguments}}
+                );
                    },
                    () -> new DelegatedDefaultClusterCallback(),
                    {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams
            );
+           {{/if}}
            {{asLowerCamelCase ../name}}_ClusterCommandInfo.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo);
      {{/chip_cluster_commands}}
      // Populate cluster
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index aba0a78fd2c673..677205ae70ee00 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -19,19 +19,19 @@
 
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/data-model/DecodableList.h>
-#include <zap-generated/CHIPClientCallbacks.h>
 #include <zap-generated/CHIPClusters.h>
+#include <zap-generated/CHIPClientCallbacks.h>
 
-#include <jni.h>
-#include <lib/core/CHIPSafeCasts.h>
 #include <lib/support/CHIPJNIError.h>
-#include <lib/support/CodeUtils.h>
 #include <lib/support/JniReferences.h>
 #include <lib/support/JniTypeWrappers.h>
+#include <jni.h>
+#include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/CodeUtils.h>
 #include <lib/support/Span.h>
 #include <platform/PlatformManager.h>
 
-#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                            \
     extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
 
 using namespace chip;
@@ -41,8 +41,7 @@ static CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthro
 static CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx);
 static void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode);
 
-CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable & outEx)
-{
+CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable & outEx) {
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID exceptionConstructor;
     jclass clusterExceptionCls;
@@ -50,18 +49,17 @@ CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable &
     err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusterException", clusterExceptionCls);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
     JniClass clusterExceptionJniCls(clusterExceptionCls);
-
+    
     exceptionConstructor = env->GetMethodID(clusterExceptionCls, "<init>", "(I)V");
     VerifyOrReturnError(exceptionConstructor != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-
+    
     outEx = (jthrowable) env->NewObject(clusterExceptionCls, exceptionConstructor, errorCode);
     VerifyOrReturnError(outEx != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
 
     return err;
 }
 
-CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx)
-{
+CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx) {
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID exceptionConstructor;
     jclass exceptionClass;
@@ -70,10 +68,10 @@ CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipE
     err = JniReferences::GetInstance().GetClassRef(env, "java/lang/IllegalStateException", exceptionClass);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
     JniClass exceptionJniClass(exceptionClass);
-
+    
     exceptionConstructor = env->GetMethodID(exceptionClass, "<init>", "(Ljava/lang/String;)V");
     VerifyOrReturnError(exceptionConstructor != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-
+    
     char buf[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
     snprintf(buf, sizeof(buf), "%s: %d", message, errorCode.AsInteger());
     errStr = env->NewStringUTF(buf);
@@ -84,23 +82,20 @@ CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipE
     return err;
 }
 
-void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode)
-{
+void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode) {
     VerifyOrReturn(callback == nullptr, ChipLogDetail(Zcl, "Callback is null in ReturnIllegalStateException(), exiting early"));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID method;
     err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-    if (err != CHIP_NO_ERROR)
-    {
+    if (err != CHIP_NO_ERROR) {
         ChipLogError(Zcl, "Error throwing IllegalStateException %d", err.AsInteger());
         return;
     }
 
     jthrowable exception;
     err = CreateIllegalStateException(env, message, errorCode, exception);
-    if (err != CHIP_NO_ERROR)
-    {
+    if (err != CHIP_NO_ERROR) {
         ChipLogError(Zcl, "Error throwing IllegalStateException %d", err.AsInteger());
         return;
     }
@@ -108,7553 +103,5572 @@ void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char mess
 }
 
 // TODO(#8773): Clean up callbacks.
-class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallback>
-{
-public:
-    CHIPDefaultSuccessCallback(jobject javaCallback) : Callback::Callback<DefaultSuccessCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallback> {
+    public:
+        CHIPDefaultSuccessCallback(jobject javaCallback): Callback::Callback<DefaultSuccessCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        ~CHIPDefaultSuccessCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            jmethodID javaMethod;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            CHIPDefaultSuccessCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDefaultSuccessCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
+            SuccessOrExit(err);
+        
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+    
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallback> {
+    public:
+        CHIPDefaultFailureCallback(jobject javaCallback): Callback::Callback<DefaultFailureCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        ~CHIPDefaultFailureCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            jmethodID javaMethod;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jthrowable exception;
+            CHIPDefaultFailureCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDefaultFailureCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onError", "(Ljava/lang/Exception;)V", &javaMethod);
+            SuccessOrExit(err);
+
+            err = CreateChipClusterException(env, status, exception);
+            SuccessOrExit(err);
+        
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, exception);
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+    
+    private:
+        jobject javaCallbackRef;
+};
+
+
+class CHIPBooleanAttributeCallback : public Callback::Callback<BooleanAttributeCallback> {
+    public:
+        CHIPBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<BooleanAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
 
-    ~CHIPDefaultSuccessCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+        static void maybeDestroy(CHIPBooleanAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
 
-    static void CallbackFn(void * context)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        jmethodID javaMethod;
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        CHIPDefaultSuccessCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, bool value)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        cppCallback = reinterpret_cast<CHIPDefaultSuccessCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+            std::unique_ptr<CHIPBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPBooleanAttributeCallback *>(context), maybeDestroy);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
-        SuccessOrExit(err);
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Z)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(value));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallback>
-{
-public:
-    CHIPDefaultFailureCallback(jobject javaCallback) : Callback::Callback<DefaultFailureCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttributeCallback> {
+    public:
+        CHIPCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<CharStringAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPCharStringAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    ~CHIPDefaultFailureCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        static void CallbackFn(void * context, const chip::CharSpan value)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        jmethodID javaMethod;
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jthrowable exception;
-        CHIPDefaultFailureCallback * cppCallback = nullptr;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            std::unique_ptr<CHIPCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPCharStringAttributeCallback *>(context), maybeDestroy);
 
-        cppCallback = reinterpret_cast<CHIPDefaultFailureCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            jmethodID javaMethod;
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onError", "(Ljava/lang/Exception;)V", &javaMethod);
-        SuccessOrExit(err);
 
-        err = CreateChipClusterException(env, status, exception);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, exception);
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            UtfString valueStr(env, value);
+            env->CallVoidMethod(javaCallbackRef, javaMethod, valueStr.jniValue());
         }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPBooleanAttributeCallback : public Callback::Callback<BooleanAttributeCallback>
-{
-public:
-    CHIPBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<BooleanAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt8sAttributeCallback : public Callback::Callback<Int8sAttributeCallback> {
+    public:
+        CHIPInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int8sAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt8sAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPBooleanAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, int8_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, bool value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt8sAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPBooleanAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Z)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttributeCallback>
-{
-public:
-    CHIPCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<CharStringAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+class CHIPInt8uAttributeCallback : public Callback::Callback<Int8uAttributeCallback> {
+    public:
+        CHIPInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int8uAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPCharStringAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
-        {
-            callback->Cancel();
-            delete callback;
+        static void maybeDestroy(CHIPInt8uAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void CallbackFn(void * context, const chip::CharSpan value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+        static void CallbackFn(void * context, uint8_t value)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPCharStringAttributeCallback *>(context), maybeDestroy);
+            std::unique_ptr<CHIPInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt8uAttributeCallback *>(context), maybeDestroy);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jmethodID javaMethod;
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-        UtfString valueStr(env, value);
-        env->CallVoidMethod(javaCallbackRef, javaMethod, valueStr.jniValue());
-    }
+        }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt8sAttributeCallback : public Callback::Callback<Int8sAttributeCallback>
-{
-public:
-    CHIPInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int8sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt16sAttributeCallback : public Callback::Callback<Int16sAttributeCallback> {
+    public:
+        CHIPInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int16sAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt16sAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt8sAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, int16_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, int8_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt16sAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt8sAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt8uAttributeCallback : public Callback::Callback<Int8uAttributeCallback>
-{
-public:
-    CHIPInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int8uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt16uAttributeCallback : public Callback::Callback<Int16uAttributeCallback> {
+    public:
+        CHIPInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int16uAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt16uAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt8uAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, uint16_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, uint8_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt16uAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt8uAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt16sAttributeCallback : public Callback::Callback<Int16sAttributeCallback>
-{
-public:
-    CHIPInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int16sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt32sAttributeCallback : public Callback::Callback<Int32sAttributeCallback> {
+    public:
+        CHIPInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int32sAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt32sAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt16sAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, int32_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, int16_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt32sAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt16sAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt16uAttributeCallback : public Callback::Callback<Int16uAttributeCallback>
-{
-public:
-    CHIPInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int16uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt32uAttributeCallback : public Callback::Callback<Int32uAttributeCallback> {
+    public:
+        CHIPInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int32uAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt32uAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt16uAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, uint32_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, uint16_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt32uAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt16uAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt32sAttributeCallback : public Callback::Callback<Int32sAttributeCallback>
-{
-public:
-    CHIPInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int32sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt64sAttributeCallback : public Callback::Callback<Int64sAttributeCallback> {
+    public:
+        CHIPInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int64sAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt64sAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt32sAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, int64_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, int32_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt64sAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt32sAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt32uAttributeCallback : public Callback::Callback<Int32uAttributeCallback>
-{
-public:
-    CHIPInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int32uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPInt64uAttributeCallback : public Callback::Callback<Int64uAttributeCallback> {
+    public:
+        CHIPInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int64uAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPInt64uAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt32uAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, uint64_t value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, uint32_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt64uAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt32uAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt64sAttributeCallback : public Callback::Callback<Int64sAttributeCallback>
-{
-public:
-    CHIPInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int64sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+class CHIPOctetStringAttributeCallback : public Callback::Callback<OctetStringAttributeCallback> {
+    public:
+        CHIPOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<OctetStringAttributeCallback>(CallbackFn, this)
+        , keepAlive(keepAlive)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+
+        static void maybeDestroy(CHIPOctetStringAttributeCallback * callback) {
+            if (!callback->keepAlive) {
+                callback->Cancel();
+                delete callback;
+            }
         }
-    }
 
-    static void maybeDestroy(CHIPInt64sAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, const chip::ByteSpan value)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
 
-    static void CallbackFn(void * context, int64_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPOctetStringAttributeCallback *>(context), maybeDestroy);
 
-        std::unique_ptr<CHIPInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt64sAttributeCallback *>(context), maybeDestroy);
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            jmethodID javaMethod;
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
-    }
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+            jbyteArray valueArr = env->NewByteArray(value.size());
+            env->ExceptionClear();
+            env->SetByteArrayRegion(valueArr, 0, value.size(), reinterpret_cast<const jbyte *>(value.data()));
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod, valueArr);
+
+        }
+
+    private:
+        jobject javaCallbackRef;
+        bool keepAlive;
 };
 
-class CHIPInt64uAttributeCallback : public Callback::Callback<Int64uAttributeCallback>
+class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>
 {
-public:
-    CHIPInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<Int64uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback): Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        ~CHIPAccountLoginClusterGetSetupPINResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void maybeDestroy(CHIPInt64uAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, chip::CharSpan setupPIN)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPAccountLoginClusterGetSetupPINResponseCallback * cppCallback = nullptr;
+            UtfString setupPINStr(env, setupPIN);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, uint64_t value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
+            cppCallback = reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPInt64uAttributeCallback *>(context), maybeDestroy);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , setupPINStr.jniValue()
+            );
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPOctetStringAttributeCallback : public Callback::Callback<OctetStringAttributeCallback>
+class CHIPApplicationLauncherClusterLaunchAppResponseCallback : public Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>
 {
-public:
-    CHIPOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false) :
-        Callback::Callback<OctetStringAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPApplicationLauncherClusterLaunchAppResponseCallback(jobject javaCallback): Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        ~CHIPApplicationLauncherClusterLaunchAppResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void maybeDestroy(CHIPOctetStringAttributeCallback * callback)
-    {
-        if (!callback->keepAlive)
+        static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
         {
-            callback->Cancel();
-            delete callback;
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::ByteSpan value)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPApplicationLauncherClusterLaunchAppResponseCallback * cppCallback = nullptr;
+            UtfString dataStr(env, data);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        std::unique_ptr<CHIPOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
-            reinterpret_cast<CHIPOctetStringAttributeCallback *>(context), maybeDestroy);
+            cppCallback = reinterpret_cast<CHIPApplicationLauncherClusterLaunchAppResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-        jbyteArray valueArr = env->NewByteArray(value.size());
-        env->ExceptionClear();
-        env->SetByteArrayRegion(valueArr, 0, value.size(), reinterpret_cast<const jbyte *>(value.data()));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , dataStr.jniValue()
+            );
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, valueArr);
-    }
 
-private:
-    jobject javaCallbackRef;
-    bool keepAlive;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>
+class CHIPContentLauncherClusterLaunchContentResponseCallback : public Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>
 {
-public:
-    CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback) :
-        Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPContentLauncherClusterLaunchContentResponseCallback(jobject javaCallback): Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPAccountLoginClusterGetSetupPINResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPContentLauncherClusterLaunchContentResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, chip::CharSpan setupPIN)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPAccountLoginClusterGetSetupPINResponseCallback * cppCallback = nullptr;
-        UtfString setupPINStr(env, setupPIN);
+        static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPContentLauncherClusterLaunchContentResponseCallback * cppCallback = nullptr;
+            UtfString dataStr(env, data);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchContentResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        cppCallback = reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, setupPINStr.jniValue());
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , dataStr.jniValue()
+                , static_cast<jint>(contentLaunchStatus)
+                            );
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPApplicationLauncherClusterLaunchAppResponseCallback
-    : public Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>
+class CHIPContentLauncherClusterLaunchURLResponseCallback : public Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>
 {
-public:
-    CHIPApplicationLauncherClusterLaunchAppResponseCallback(jobject javaCallback) :
-        Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback): Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPContentLauncherClusterLaunchURLResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPApplicationLauncherClusterLaunchAppResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPContentLauncherClusterLaunchURLResponseCallback * cppCallback = nullptr;
+            UtfString dataStr(env, data);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPApplicationLauncherClusterLaunchAppResponseCallback * cppCallback = nullptr;
-        UtfString dataStr(env, data);
+            cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchURLResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        cppCallback = reinterpret_cast<CHIPApplicationLauncherClusterLaunchAppResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , dataStr.jniValue()
+                , static_cast<jint>(contentLaunchStatus)
+                            );
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), dataStr.jniValue());
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
+{
+    public:
+        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback): Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback * cppCallback = nullptr;
+            jbyteArray contentArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I[BJJ)V", &javaMethod);
+            SuccessOrExit(err);
+
+            contentArr = env->NewByteArray(content.size());
+            VerifyOrExit(contentArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(contentArr, 0, content.size(), reinterpret_cast<const jbyte *>(content.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , contentArr
+                , static_cast<jlong>(timeStamp)
+                                , static_cast<jlong>(timeSinceBoot)
+                            );
+
+            env->DeleteLocalRef(contentArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchContentResponseCallback
-    : public Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>
+class CHIPDoorLockClusterClearAllPinsResponseCallback : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
 {
-public:
-    CHIPContentLauncherClusterLaunchContentResponseCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPContentLauncherClusterLaunchContentResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterClearAllPinsResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPContentLauncherClusterLaunchContentResponseCallback * cppCallback = nullptr;
-        UtfString dataStr(env, data);
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearAllPinsResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchContentResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, dataStr.jniValue(), static_cast<jint>(contentLaunchStatus));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchURLResponseCallback
-    : public Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>
+class CHIPDoorLockClusterClearAllRfidsResponseCallback : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>
 {
-public:
-    CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPContentLauncherClusterLaunchURLResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterClearAllRfidsResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPContentLauncherClusterLaunchURLResponseCallback * cppCallback = nullptr;
-        UtfString dataStr(env, data);
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearAllRfidsResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchURLResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, dataStr.jniValue(), static_cast<jint>(contentLaunchStatus));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
-    : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
+class CHIPDoorLockClusterClearHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
 {
-public:
-    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) :
-        Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterClearHolidayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback * cppCallback = nullptr;
-        jbyteArray contentArr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I[BJJ)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        contentArr = env->NewByteArray(content.size());
-        VerifyOrExit(contentArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(contentArr, 0, content.size(), reinterpret_cast<const jbyte *>(content.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), contentArr, static_cast<jlong>(timeStamp),
-                            static_cast<jlong>(timeSinceBoot));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-        env->DeleteLocalRef(contentArr);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearAllPinsResponseCallback : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
+class CHIPDoorLockClusterClearPinResponseCallback : public Callback::Callback<DoorLockClusterClearPinResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterClearAllPinsResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterClearPinResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearAllPinsResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearPinResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        if (cppCallback != nullptr)
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDoorLockClusterClearRfidResponseCallback : public Callback::Callback<DoorLockClusterClearRfidResponseCallback>
+{
+    public:
+        CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
         {
-            cppCallback->Cancel();
-            delete cppCallback;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
+        ~CHIPDoorLockClusterClearRfidResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-private:
-    jobject javaCallbackRef;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearRfidResponseCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearAllRfidsResponseCallback : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>
+class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPDoorLockClusterClearAllRfidsResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        static void CallbackFn(void * context, uint8_t status)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearAllRfidsResponseCallback * cppCallback = nullptr;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearHolidayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
+class CHIPDoorLockClusterClearYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearHolidayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterClearYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterClearHolidayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterClearYeardayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearHolidayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterClearYeardayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearPinResponseCallback : public Callback::Callback<DoorLockClusterClearPinResponseCallback>
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterClearPinResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearPinResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIJJI)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(scheduleId)
+                                , static_cast<jint>(status)
+                                , static_cast<jlong>(localStartTime)
+                                , static_cast<jlong>(localEndTime)
+                                , static_cast<jint>(operatingModeDuringHoliday)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPDoorLockClusterGetLogRecordResponseCallback : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>
+{
+    public:
+        CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPDoorLockClusterGetLogRecordResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetLogRecordResponseCallback * cppCallback = nullptr;
+            jbyteArray pinArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJIIII[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            pinArr = env->NewByteArray(pin.size());
+            VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(logEntryId)
+                                , static_cast<jlong>(timestamp)
+                                , static_cast<jint>(eventType)
+                                , static_cast<jint>(source)
+                                , static_cast<jint>(eventIdOrAlarmCode)
+                                , static_cast<jint>(userId)
+                                , pinArr
+            );
+
+            env->DeleteLocalRef(pinArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearRfidResponseCallback : public Callback::Callback<DoorLockClusterClearRfidResponseCallback>
+class CHIPDoorLockClusterGetPinResponseCallback : public Callback::Callback<DoorLockClusterGetPinResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+    public:
+        CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPDoorLockClusterGetPinResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetPinResponseCallback * cppCallback = nullptr;
+            jbyteArray pinArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            pinArr = env->NewByteArray(pin.size());
+            VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(userId)
+                                , static_cast<jint>(userStatus)
+                                , static_cast<jint>(userType)
+                                , pinArr
+            );
+
+            env->DeleteLocalRef(pinArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+class CHIPDoorLockClusterGetRfidResponseCallback : public Callback::Callback<DoorLockClusterGetRfidResponseCallback>
+{
+    public:
+        CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPDoorLockClusterGetRfidResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetRfidResponseCallback * cppCallback = nullptr;
+            jbyteArray rfidArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            rfidArr = env->NewByteArray(rfid.size());
+            VerifyOrExit(rfidArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(rfidArr, 0, rfid.size(), reinterpret_cast<const jbyte *>(rfid.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(userId)
+                                , static_cast<jint>(userStatus)
+                                , static_cast<jint>(userType)
+                                , rfidArr
+            );
+
+            env->DeleteLocalRef(rfidArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDoorLockClusterGetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>
+{
+    public:
+        CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterClearRfidResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterGetUserTypeResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearRfidResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetUserTypeResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(userId)
+                                , static_cast<jint>(userType)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
+class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearWeekdayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIIIIII)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(scheduleId)
+                                , static_cast<jint>(userId)
+                                , static_cast<jint>(status)
+                                , static_cast<jint>(daysMask)
+                                , static_cast<jint>(startHour)
+                                , static_cast<jint>(startMinute)
+                                , static_cast<jint>(endHour)
+                                , static_cast<jint>(endMinute)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearYeardayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
+class CHIPDoorLockClusterGetYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterClearYeardayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPDoorLockClusterGetYeardayScheduleResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPDoorLockClusterClearYeardayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterGetYeardayScheduleResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterClearYeardayScheduleResponseCallback * cppCallback = nullptr;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIJJ)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(scheduleId)
+                                , static_cast<jint>(userId)
+                                , static_cast<jint>(status)
+                                , static_cast<jlong>(localStartTime)
+                                , static_cast<jlong>(localEndTime)
+                            );
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
+class CHIPDoorLockClusterLockDoorResponseCallback : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterLockDoorResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime,
-                           uint8_t operatingModeDuringHoliday)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetHolidayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterLockDoorResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIJJI)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(status),
-                            static_cast<jlong>(localStartTime), static_cast<jlong>(localEndTime),
-                            static_cast<jint>(operatingModeDuringHoliday));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetLogRecordResponseCallback : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>
+class CHIPDoorLockClusterSetHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetLogRecordResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterSetHolidayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
-                           uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetLogRecordResponseCallback * cppCallback = nullptr;
-        jbyteArray pinArr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJIIII[B)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        pinArr = env->NewByteArray(pin.size());
-        VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(logEntryId), static_cast<jlong>(timestamp),
-                            static_cast<jint>(eventType), static_cast<jint>(source), static_cast<jint>(eventIdOrAlarmCode),
-                            static_cast<jint>(userId), pinArr);
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-        env->DeleteLocalRef(pinArr);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetPinResponseCallback : public Callback::Callback<DoorLockClusterGetPinResponseCallback>
+class CHIPDoorLockClusterSetPinResponseCallback : public Callback::Callback<DoorLockClusterSetPinResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetPinResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterSetPinResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetPinResponseCallback * cppCallback = nullptr;
-        jbyteArray pinArr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetPinResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        pinArr = env->NewByteArray(pin.size());
-        VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userStatus),
-                            static_cast<jint>(userType), pinArr);
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-        env->DeleteLocalRef(pinArr);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetRfidResponseCallback : public Callback::Callback<DoorLockClusterGetRfidResponseCallback>
+class CHIPDoorLockClusterSetRfidResponseCallback : public Callback::Callback<DoorLockClusterSetRfidResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetRfidResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterSetRfidResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetRfidResponseCallback * cppCallback = nullptr;
-        jbyteArray rfidArr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetRfidResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        rfidArr = env->NewByteArray(rfid.size());
-        VerifyOrExit(rfidArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(rfidArr, 0, rfid.size(), reinterpret_cast<const jbyte *>(rfid.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userStatus),
-                            static_cast<jint>(userType), rfidArr);
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-        env->DeleteLocalRef(rfidArr);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>
+class CHIPDoorLockClusterSetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPDoorLockClusterSetUserTypeResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetUserTypeResponseCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetUserTypeResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
+{
+    public:
+        CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+        ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetUserTypeResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userType));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
+class CHIPDoorLockClusterSetYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterSetYeardayScheduleResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour,
-                           uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetWeekdayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterSetYeardayScheduleResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIIIIII)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(userId),
-                            static_cast<jint>(status), static_cast<jint>(daysMask), static_cast<jint>(startHour),
-                            static_cast<jint>(startMinute), static_cast<jint>(endHour), static_cast<jint>(endMinute));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetYeardayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
+class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
 {
-public:
-    CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterGetYeardayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterUnlockDoorResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime,
-                           uint32_t localEndTime)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterGetYeardayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterUnlockDoorResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIJJ)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(userId),
-                            static_cast<jint>(status), static_cast<jlong>(localStartTime), static_cast<jlong>(localEndTime));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterLockDoorResponseCallback : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
+class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
 {
-public:
-    CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterLockDoorResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterLockDoorResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPDoorLockClusterUnlockWithTimeoutResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetHolidayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetHolidayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetHolidayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetPinResponseCallback : public Callback::Callback<DoorLockClusterSetPinResponseCallback>
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetPinResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback : public Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>
+{
+    public:
+        CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+        ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetPinResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetRfidResponseCallback : public Callback::Callback<DoorLockClusterSetRfidResponseCallback>
+class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetRfidResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPGroupsClusterAddGroupResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetRfidResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGroupsClusterAddGroupResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>
+class CHIPGroupsClusterGetGroupMembershipResponseCallback : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetUserTypeResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPGroupsClusterGetGroupMembershipResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetUserTypeResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGroupsClusterGetGroupMembershipResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(capacity)
+                                , static_cast<jint>(groupCount)
+                                // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
+class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPGroupsClusterRemoveGroupResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetWeekdayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGroupsClusterRemoveGroupResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
+{
+    public:
+        CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPGroupsClusterViewGroupResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
+            UtfString groupNameStr(env, groupName);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , groupNameStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetYeardayScheduleResponseCallback
-    : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
+class CHIPIdentifyClusterIdentifyQueryResponseCallback : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>
 {
-public:
-    CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback): Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-    ~CHIPDoorLockClusterSetYeardayScheduleResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        ~CHIPIdentifyClusterIdentifyQueryResponseCallback()
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterSetYeardayScheduleResponseCallback * cppCallback = nullptr;
+        static void CallbackFn(void * context, uint16_t timeout)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPIdentifyClusterIdentifyQueryResponseCallback * cppCallback = nullptr;
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            cppCallback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(timeout)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
+class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<KeypadInputClusterSendKeyResponseCallback>
 {
-public:
-    CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback): Callback::Callback<KeypadInputClusterSendKeyResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPKeypadInputClusterSendKeyResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPDoorLockClusterUnlockDoorResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterUnlockDoorResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPKeypadInputClusterSendKeyResponseCallback * cppCallback = nullptr;
 
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            cppCallback = reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
 
-private:
-    jobject javaCallbackRef;
-};
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                            );
 
-class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback
-    : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
-{
-public:
-    CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback) :
-        Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-    ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        
+    private:
         jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPDoorLockClusterUnlockWithTimeoutResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
-    : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
+class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>
 {
-public:
-    CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback) :
-        Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        if (cppCallback != nullptr)
+        ~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback()
         {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
-    : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
-{
-public:
-    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
-        Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaFastForwardResponseCallback * cppCallback = nullptr;
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
 
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
-    : public Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>
+class CHIPMediaPlaybackClusterMediaNextResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>
 {
-public:
-    CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback) :
-        Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        if (cppCallback != nullptr)
+        ~CHIPMediaPlaybackClusterMediaNextResponseCallback()
         {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
-{
-public:
-    CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback) :
-        Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGroupsClusterAddGroupResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGroupsClusterAddGroupResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterGetGroupMembershipResponseCallback
-    : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
-{
-public:
-    CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback) :
-        Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGroupsClusterGetGroupMembershipResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount,
-                           /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGroupsClusterGetGroupMembershipResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(capacity), static_cast<jint>(groupCount)
-                            // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-        );
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
-{
-public:
-    CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback) :
-        Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGroupsClusterRemoveGroupResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGroupsClusterRemoveGroupResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
-{
-public:
-    CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback) :
-        Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPGroupsClusterViewGroupResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
-        UtfString groupNameStr(env, groupName);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
-                            groupNameStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPIdentifyClusterIdentifyQueryResponseCallback : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>
-{
-public:
-    CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback) :
-        Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPIdentifyClusterIdentifyQueryResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint16_t timeout)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPIdentifyClusterIdentifyQueryResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(timeout));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<KeypadInputClusterSendKeyResponseCallback>
-{
-public:
-    CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback) :
-        Callback::Callback<KeypadInputClusterSendKeyResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPKeypadInputClusterSendKeyResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPKeypadInputClusterSendKeyResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaFastForwardResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaNextResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaNextResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaNextResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaNextResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaPauseResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaPauseResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaPauseResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPauseResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaPlayResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaPlayResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaPlayResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPlayResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaPreviousResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaPreviousResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaPreviousResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPreviousResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaRewindResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaRewindResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaRewindResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaRewindResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaSeekResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaSeekResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaSeekResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSeekResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaStartOverResponseCallback
-    : public Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaStartOverResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaStartOverResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaStartOverResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStartOverResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPMediaPlaybackClusterMediaStopResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>
-{
-public:
-    CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback) :
-        Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPMediaPlaybackClusterMediaStopResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPMediaPlaybackClusterMediaStopResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStopResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterDisableNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterDisableNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterDisableNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterEnableNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterEnableNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterEnableNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText,
-                           /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
-                           /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterScanNetworksResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue()
-                            // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-                            // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-        );
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
-    : public Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>
-{
-public:
-    CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(jobject javaCallback) :
-        Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback * cppCallback = nullptr;
-        UtfString debugTextStr(env, debugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback
-    : public Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>
-{
-public:
-    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(jobject javaCallback) :
-        Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t action, uint32_t delayedActionTime)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJ)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(action), static_cast<jlong>(delayedActionTime));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
-    : public Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>
-{
-public:
-    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback) :
-        Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, chip::CharSpan imageURI,
-                           uint32_t softwareVersion, chip::CharSpan softwareVersionString, chip::ByteSpan updateToken,
-                           bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback * cppCallback = nullptr;
-        UtfString imageURIStr(env, imageURI);
-        UtfString softwareVersionStringStr(env, softwareVersionString);
-        jbyteArray updateTokenArr;
-        jbyteArray metadataForRequestorArr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
-                                                      "(IJLjava/lang/String;JLjava/lang/String;[BZ[B)V", &javaMethod);
-        SuccessOrExit(err);
-
-        updateTokenArr = env->NewByteArray(updateToken.size());
-        VerifyOrExit(updateTokenArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(updateTokenArr, 0, updateToken.size(), reinterpret_cast<const jbyte *>(updateToken.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-        metadataForRequestorArr = env->NewByteArray(metadataForRequestor.size());
-        VerifyOrExit(metadataForRequestorArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(metadataForRequestorArr, 0, metadataForRequestor.size(),
-                                reinterpret_cast<const jbyte *>(metadataForRequestor.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jlong>(delayedActionTime),
-                            imageURIStr.jniValue(), static_cast<jlong>(softwareVersion), softwareVersionStringStr.jniValue(),
-                            updateTokenArr, static_cast<jboolean>(userConsentNeeded), metadataForRequestorArr);
-
-        env->DeleteLocalRef(updateTokenArr);
-        env->DeleteLocalRef(metadataForRequestorArr);
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOperationalCredentialsClusterAttestationResponseCallback
-    : public Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>
-{
-public:
-    CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOperationalCredentialsClusterAttestationResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOperationalCredentialsClusterAttestationResponseCallback * cppCallback = nullptr;
-        jbyteArray AttestationElementsArr;
-        jbyteArray SignatureArr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
-        SuccessOrExit(err);
-
-        AttestationElementsArr = env->NewByteArray(AttestationElements.size());
-        VerifyOrExit(AttestationElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(AttestationElementsArr, 0, AttestationElements.size(),
-                                reinterpret_cast<const jbyte *>(AttestationElements.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-        SignatureArr = env->NewByteArray(Signature.size());
-        VerifyOrExit(SignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(SignatureArr, 0, Signature.size(), reinterpret_cast<const jbyte *>(Signature.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, AttestationElementsArr, SignatureArr);
-
-        env->DeleteLocalRef(AttestationElementsArr);
-        env->DeleteLocalRef(SignatureArr);
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOperationalCredentialsClusterCertificateChainResponseCallback
-    : public Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>
-{
-public:
-    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, chip::ByteSpan Certificate)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOperationalCredentialsClusterCertificateChainResponseCallback * cppCallback = nullptr;
-        jbyteArray CertificateArr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
-        SuccessOrExit(err);
-
-        CertificateArr = env->NewByteArray(Certificate.size());
-        VerifyOrExit(CertificateArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(CertificateArr, 0, Certificate.size(), reinterpret_cast<const jbyte *>(Certificate.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, CertificateArr);
-
-        env->DeleteLocalRef(CertificateArr);
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOperationalCredentialsClusterNOCResponseCallback
-    : public Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>
-{
-public:
-    CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOperationalCredentialsClusterNOCResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::CharSpan DebugText)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOperationalCredentialsClusterNOCResponseCallback * cppCallback = nullptr;
-        UtfString DebugTextStr(env, DebugText);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(StatusCode), static_cast<jint>(FabricIndex),
-                            DebugTextStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPOperationalCredentialsClusterOpCSRResponseCallback
-    : public Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>
-{
-public:
-    CHIPOperationalCredentialsClusterOpCSRResponseCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPOperationalCredentialsClusterOpCSRResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPOperationalCredentialsClusterOpCSRResponseCallback * cppCallback = nullptr;
-        jbyteArray NOCSRElementsArr;
-        jbyteArray AttestationSignatureArr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterOpCSRResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
-        SuccessOrExit(err);
-
-        NOCSRElementsArr = env->NewByteArray(NOCSRElements.size());
-        VerifyOrExit(NOCSRElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(NOCSRElementsArr, 0, NOCSRElements.size(), reinterpret_cast<const jbyte *>(NOCSRElements.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-        AttestationSignatureArr = env->NewByteArray(AttestationSignature.size());
-        VerifyOrExit(AttestationSignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(AttestationSignatureArr, 0, AttestationSignature.size(),
-                                reinterpret_cast<const jbyte *>(AttestationSignature.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, NOCSRElementsArr, AttestationSignatureArr);
-
-        env->DeleteLocalRef(NOCSRElementsArr);
-        env->DeleteLocalRef(AttestationSignatureArr);
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
-{
-public:
-    CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterAddSceneResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterAddSceneResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
-                            static_cast<jint>(sceneId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterGetSceneMembershipResponseCallback
-    : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
-{
-public:
-    CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterGetSceneMembershipResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
-                           /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterGetSceneMembershipResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIII)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(capacity),
-                            static_cast<jint>(groupId), static_cast<jint>(sceneCount)
-                            // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-        );
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterRemoveAllScenesResponseCallback : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
-{
-public:
-    CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterRemoveAllScenesResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterRemoveAllScenesResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
-{
-public:
-    CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterRemoveSceneResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterRemoveSceneResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
-                            static_cast<jint>(sceneId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
-{
-public:
-    CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterStoreSceneResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterStoreSceneResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
-                            static_cast<jint>(sceneId));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
-{
-public:
-    CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback) :
-        Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPScenesClusterViewSceneResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                           chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
-        UtfString sceneNameStr(env, sceneName);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
-                            static_cast<jint>(sceneId), static_cast<jint>(transitionTime), sceneNameStr.jniValue()
-                            // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-        );
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callback<TvChannelClusterChangeChannelResponseCallback>
-{
-public:
-    CHIPTvChannelClusterChangeChannelResponseCallback(jobject javaCallback) :
-        Callback::Callback<TvChannelClusterChangeChannelResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTvChannelClusterChangeChannelResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch, uint8_t ErrorType)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTvChannelClusterChangeChannelResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTvChannelClusterChangeChannelResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef,
-                            javaMethod
-                            // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-                            ,
-                            static_cast<jint>(ErrorType));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
-    : public Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>
-{
-public:
-    CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback) :
-        Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTargetNavigatorClusterNavigateTargetResponseCallback * cppCallback = nullptr;
-        UtfString dataStr(env, data);
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), dataStr.jniValue());
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTestClusterClusterTestAddArgumentsResponseCallback
-    : public Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>
-{
-public:
-    CHIPTestClusterClusterTestAddArgumentsResponseCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t returnValue)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTestClusterClusterTestAddArgumentsResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(returnValue));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTestClusterClusterTestEnumsResponseCallback : public Callback::Callback<TestClusterClusterTestEnumsResponseCallback>
-{
-public:
-    CHIPTestClusterClusterTestEnumsResponseCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterClusterTestEnumsResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTestClusterClusterTestEnumsResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, chip::VendorId arg1, uint8_t arg2)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTestClusterClusterTestEnumsResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestEnumsResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(arg1), static_cast<jint>(arg2));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
-    : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
-{
-public:
-    CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t * arg1)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTestClusterClusterTestListInt8UReverseResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod
-                            // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
-                            // Conversion from this type to Java is not properly implemented yet
-        );
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTestClusterClusterTestNullableOptionalResponseCallback
-    : public Callback::Callback<TestClusterClusterTestNullableOptionalResponseCallback>
-{
-public:
-    CHIPTestClusterClusterTestNullableOptionalResponseCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterClusterTestNullableOptionalResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTestClusterClusterTestNullableOptionalResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, bool wasPresent, bool wasNull, uint8_t value, uint8_t originalValue)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTestClusterClusterTestNullableOptionalResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestNullableOptionalResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ZZII)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(wasPresent), static_cast<jboolean>(wasNull),
-                            static_cast<jint>(value), static_cast<jint>(originalValue));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPTestClusterClusterTestSpecificResponseCallback : public Callback::Callback<TestClusterClusterTestSpecificResponseCallback>
-{
-public:
-    CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterClusterTestSpecificResponseCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-    ~CHIPTestClusterClusterTestSpecificResponseCallback()
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-        env->DeleteGlobalRef(javaCallbackRef);
-    };
-
-    static void CallbackFn(void * context, uint8_t returnValue)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-        jmethodID javaMethod;
-        CHIPTestClusterClusterTestSpecificResponseCallback * cppCallback = nullptr;
-
-        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context);
-        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-        javaCallbackRef = cppCallback->javaCallbackRef;
-        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-        SuccessOrExit(err);
-
-        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(returnValue));
-
-    exit:
-        if (err != CHIP_NO_ERROR)
-        {
-            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-        }
-        if (cppCallback != nullptr)
-        {
-            cppCallback->Cancel();
-            delete cppCallback;
-        }
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPApplicationLauncherApplicationLauncherListAttributeCallback
-    : public Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>
-{
-public:
-    CHIPApplicationLauncherApplicationLauncherListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-        std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPApplicationLauncherApplicationLauncherListAttributeCallback *>(context));
-
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, applicationLauncherList);
-        }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding ApplicationLauncherListAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
-
-private:
-    jobject javaCallbackRef;
-};
-
-class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>
-{
-public:
-    CHIPAudioOutputAudioOutputListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
-
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
-
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
-
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-        std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPAudioOutputAudioOutputListAttributeCallback *>(context));
-
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaNextResponseCallback * cppCallback = nullptr;
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl,
-                         "Could not find class chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaNextResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry    = iter.GetValue();
-            jint index      = entry.index;
-            jint outputType = entry.outputType;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, outputType, name);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-private:
-    jobject javaCallbackRef;
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPBridgedActionsActionListAttributeCallback : public Callback::Callback<BridgedActionsActionListListAttributeCallback>
+class CHIPMediaPlaybackClusterMediaPauseResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>
 {
-public:
-    CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<BridgedActionsActionListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPMediaPlaybackClusterMediaPauseResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaPauseResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPauseResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;IIII)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ActionListAttribute constructor"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry  = iter.GetValue();
-            jint actionID = entry.actionID;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
-            jint type              = entry.type;
-            jint endpointListID    = entry.endpointListID;
-            jint supportedCommands = entry.supportedCommands;
-            jint status            = entry.status;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-            jobject attributeObj =
-                env->NewObject(attributeClass, attributeCtor, actionID, name, type, endpointListID, supportedCommands, status);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ActionListAttribute object"));
+class CHIPMediaPlaybackClusterMediaPlayResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>
+{
+    public:
+        CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ActionListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPMediaPlaybackClusterMediaPlayResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaPlayResponseCallback * cppCallback = nullptr;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPlayResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPBridgedActionsEndpointListAttributeCallback : public Callback::Callback<BridgedActionsEndpointListListAttributeCallback>
+class CHIPMediaPlaybackClusterMediaPreviousResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>
 {
-public:
-    CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<BridgedActionsEndpointListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPMediaPlaybackClusterMediaPreviousResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaPreviousResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
-            list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPreviousResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl,
-                         "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;I[B)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find EndpointListAttribute constructor"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry        = iter.GetValue();
-            jint endpointListID = entry.endpointListID;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
-            jint type            = entry.type;
-            jbyteArray endpoints = env->NewByteArray(entry.endpoints.size());
-            env->SetByteArrayRegion(endpoints, 0, entry.endpoints.size(), reinterpret_cast<const jbyte *>(entry.endpoints.data()));
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, endpointListID, name, type, endpoints);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create EndpointListAttribute object"));
+class CHIPMediaPlaybackClusterMediaRewindResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>
+{
+    public:
+        CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding EndpointListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPMediaPlaybackClusterMediaRewindResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaRewindResponseCallback * cppCallback = nullptr;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaRewindResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherAcceptsHeaderListAttributeCallback
-    : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
+class CHIPMediaPlaybackClusterMediaSeekResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>
 {
-public:
-    CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPMediaPlaybackClusterMediaSeekResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaSeekResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSeekResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        auto iter = list.begin();
-        while (iter.Next())
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>
+{
+    public:
+        CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(CallbackFn, this)
         {
-            auto & entry                 = iter.GetValue();
-            jbyteArray acceptsHeaderList = env->NewByteArray(entry.size());
-            env->SetByteArrayRegion(acceptsHeaderList, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding AcceptsHeaderListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback * cppCallback = nullptr;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
-    : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
+class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>
 {
-public:
-    CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback * cppCallback = nullptr;
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        auto iter = list.begin();
-        while (iter.Next())
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPMediaPlaybackClusterMediaStartOverResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>
+{
+    public:
+        CHIPMediaPlaybackClusterMediaStartOverResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>(CallbackFn, this)
         {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding SupportedStreamingTypesAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
+        ~CHIPMediaPlaybackClusterMediaStartOverResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaStartOverResponseCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStartOverResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
 
-private:
-    jobject javaCallbackRef;
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<DescriptorDeviceListListAttributeCallback>
+class CHIPMediaPlaybackClusterMediaStopResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>
 {
-public:
-    CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<DescriptorDeviceListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPMediaPlaybackClusterMediaStopResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPMediaPlaybackClusterMediaStopResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStopResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(mediaPlaybackStatus)
+                            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JI)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find DeviceListAttribute constructor"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry  = iter.GetValue();
-            jlong type    = entry.type;
-            jint revision = entry.revision;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, type, revision);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create DeviceListAttribute object"));
+class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>
+{
+    public:
+        CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding DeviceListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-private:
-    jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<DescriptorServerListListAttributeCallback>
+class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>
 {
-public:
-    CHIPDescriptorServerListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<DescriptorServerListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPDescriptorServerListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
-            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-            jobject serverList      = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, serverList);
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ServerListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<DescriptorClientListListAttributeCallback>
+class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>
 {
-public:
-    CHIPDescriptorClientListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<DescriptorClientListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPNetworkCommissioningClusterDisableNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPNetworkCommissioningClusterDisableNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterDisableNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPDescriptorClientListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
-            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-            jobject clientList      = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, clientList);
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ClientListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<DescriptorPartsListListAttributeCallback>
+class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>
 {
-public:
-    CHIPDescriptorPartsListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<DescriptorPartsListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPNetworkCommissioningClusterEnableNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPNetworkCommissioningClusterEnableNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterEnableNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPDescriptorPartsListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject partsList       = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, partsList);
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding PartsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
-
-private:
-    jobject javaCallbackRef;
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<FixedLabelLabelListListAttributeCallback>
+class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>
 {
-public:
-    CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<FixedLabelLabelListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPNetworkCommissioningClusterScanNetworksResponseCallback : public Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>
+{
+    public:
+        CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText, /* TYPE WARNING: array array defaults to */ uint8_t *  wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t *  threadScanResults)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterScanNetworksResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+                // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+                // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>
+{
+    public:
+        CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        auto iter = list.begin();
-        while (iter.Next())
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            auto & entry = iter.GetValue();
-            UtfString labelStr(env, entry.label);
-            jstring label(labelStr.jniValue());
-            UtfString valueStr(env, entry.value);
-            jstring value(valueStr.jniValue());
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, label, value);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-private:
-    jobject javaCallbackRef;
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
-    : public Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>
+class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>
 {
-public:
-    CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<
-                   chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute",
-            attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl,
-                         "Could not find class "
-                         "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(J)V");
-        VerifyOrReturn(attributeCtor != nullptr,
-                       ChipLogError(Zcl, "Could not find BasicCommissioningInfoListAttribute constructor"));
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-        auto iter = list.begin();
-        while (iter.Next())
+class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback : public Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>
+{
+    public:
+        CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(jobject javaCallback): Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t action, uint32_t delayedActionTime)
         {
-            auto & entry                 = iter.GetValue();
-            jlong failSafeExpiryLengthMs = entry.failSafeExpiryLengthMs;
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJ)V", &javaMethod);
+            SuccessOrExit(err);
+
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, failSafeExpiryLengthMs);
-            VerifyOrReturn(attributeObj != nullptr,
-                           ChipLogError(Zcl, "Could not create BasicCommissioningInfoListAttribute object"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(action)
+                                , static_cast<jlong>(delayedActionTime)
+                            );
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding BasicCommissioningInfoListAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback : public Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>
+{
+    public:
+        CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback): Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, chip::CharSpan imageURI, uint32_t softwareVersion, chip::CharSpan softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback * cppCallback = nullptr;
+            UtfString imageURIStr(env, imageURI);
+                        UtfString softwareVersionStringStr(env, softwareVersionString);
+                        jbyteArray updateTokenArr;
+            jbyteArray metadataForRequestorArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJLjava/lang/String;JLjava/lang/String;[BZ[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            updateTokenArr = env->NewByteArray(updateToken.size());
+            VerifyOrExit(updateTokenArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(updateTokenArr, 0, updateToken.size(), reinterpret_cast<const jbyte *>(updateToken.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+            metadataForRequestorArr = env->NewByteArray(metadataForRequestor.size());
+            VerifyOrExit(metadataForRequestorArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(metadataForRequestorArr, 0, metadataForRequestor.size(), reinterpret_cast<const jbyte *>(metadataForRequestor.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jlong>(delayedActionTime)
+                                , imageURIStr.jniValue()
+                , static_cast<jlong>(softwareVersion)
+                                , softwareVersionStringStr.jniValue()
+                , updateTokenArr
+                , static_cast<jboolean>(userConsentNeeded)
+                                , metadataForRequestorArr
+            );
+
+            env->DeleteLocalRef(updateTokenArr);
+            env->DeleteLocalRef(metadataForRequestorArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPOperationalCredentialsClusterAttestationResponseCallback : public Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>
+{
+    public:
+        CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPOperationalCredentialsClusterAttestationResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOperationalCredentialsClusterAttestationResponseCallback * cppCallback = nullptr;
+            jbyteArray AttestationElementsArr;
+            jbyteArray SignatureArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            AttestationElementsArr = env->NewByteArray(AttestationElements.size());
+            VerifyOrExit(AttestationElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(AttestationElementsArr, 0, AttestationElements.size(), reinterpret_cast<const jbyte *>(AttestationElements.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+            SignatureArr = env->NewByteArray(Signature.size());
+            VerifyOrExit(SignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(SignatureArr, 0, Signature.size(), reinterpret_cast<const jbyte *>(Signature.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , AttestationElementsArr
+                , SignatureArr
+            );
+
+            env->DeleteLocalRef(AttestationElementsArr);
+            env->DeleteLocalRef(SignatureArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
-    : public Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
+class CHIPOperationalCredentialsClusterCertificateChainResponseCallback : public Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>
 {
-public:
-    CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback) :
-        Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, chip::ByteSpan Certificate)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOperationalCredentialsClusterCertificateChainResponseCallback * cppCallback = nullptr;
+            jbyteArray CertificateArr;
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            CertificateArr = env->NewByteArray(Certificate.size());
+            VerifyOrExit(CertificateArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(CertificateArr, 0, Certificate.size(), reinterpret_cast<const jbyte *>(Certificate.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , CertificateArr
+            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl,
-                "Could not find class chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(Ljava/lang/String;ZZZ[BI)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NetworkInterfacesAttribute constructor"));
+            env->DeleteLocalRef(CertificateArr);
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
-            jboolean fabricConnected                 = entry.fabricConnected;
-            jboolean offPremiseServicesReachableIPv4 = entry.offPremiseServicesReachableIPv4;
-            jboolean offPremiseServicesReachableIPv6 = entry.offPremiseServicesReachableIPv6;
-            jbyteArray hardwareAddress               = env->NewByteArray(entry.hardwareAddress.size());
-            env->SetByteArrayRegion(hardwareAddress, 0, entry.hardwareAddress.size(),
-                                    reinterpret_cast<const jbyte *>(entry.hardwareAddress.data()));
-            jint type = entry.type;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-            jobject attributeObj =
-                env->NewObject(attributeClass, attributeCtor, name, fabricConnected, offPremiseServicesReachableIPv4,
-                               offPremiseServicesReachableIPv6, hardwareAddress, type);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NetworkInterfacesAttribute object"));
+class CHIPOperationalCredentialsClusterNOCResponseCallback : public Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>
+{
+    public:
+        CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding NetworkInterfacesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPOperationalCredentialsClusterNOCResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::CharSpan DebugText)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOperationalCredentialsClusterNOCResponseCallback * cppCallback = nullptr;
+            UtfString DebugTextStr(env, DebugText);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-private:
-    jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(StatusCode)
+                                , static_cast<jint>(FabricIndex)
+                                , DebugTextStr.jniValue()
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>
+class CHIPOperationalCredentialsClusterOpCSRResponseCallback : public Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>
+{
+    public:
+        CHIPOperationalCredentialsClusterOpCSRResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPOperationalCredentialsClusterOpCSRResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPOperationalCredentialsClusterOpCSRResponseCallback * cppCallback = nullptr;
+            jbyteArray NOCSRElementsArr;
+            jbyteArray AttestationSignatureArr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterOpCSRResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
+            SuccessOrExit(err);
+
+            NOCSRElementsArr = env->NewByteArray(NOCSRElements.size());
+            VerifyOrExit(NOCSRElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(NOCSRElementsArr, 0, NOCSRElements.size(), reinterpret_cast<const jbyte *>(NOCSRElements.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+            AttestationSignatureArr = env->NewByteArray(AttestationSignature.size());
+            VerifyOrExit(AttestationSignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+            env->ExceptionClear();
+            env->SetByteArrayRegion(AttestationSignatureArr, 0, AttestationSignature.size(), reinterpret_cast<const jbyte *>(AttestationSignature.data()));
+            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , NOCSRElementsArr
+                , AttestationSignatureArr
+            );
+
+            env->DeleteLocalRef(NOCSRElementsArr);
+            env->DeleteLocalRef(AttestationSignatureArr);
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
 {
-public:
-    CHIPGroupKeyManagementGroupsAttributeCallback(jobject javaCallback) :
-        Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPScenesClusterAddSceneResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterAddSceneResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> &
-            list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPGroupKeyManagementGroupsAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneId)
+                            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(III)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry          = iter.GetValue();
-            jint vendorId         = entry.vendorId;
-            jint vendorGroupId    = entry.vendorGroupId;
-            jint groupKeySetIndex = entry.groupKeySetIndex;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, vendorGroupId, groupKeySetIndex);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
+class CHIPScenesClusterGetSceneMembershipResponseCallback : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
+{
+    public:
+        CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPScenesClusterGetSceneMembershipResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterGetSceneMembershipResponseCallback * cppCallback = nullptr;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIII)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(capacity)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneCount)
+                                // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>
+class CHIPScenesClusterRemoveAllScenesResponseCallback : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
 {
-public:
-    CHIPGroupKeyManagementGroupKeysAttributeCallback(jobject javaCallback) :
-        Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPScenesClusterRemoveAllScenesResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterRemoveAllScenesResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPGroupKeyManagementGroupKeysAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
+{
+    public:
+        CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl,
-                         "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[BJI)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupKeysAttribute constructor"));
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPScenesClusterRemoveSceneResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        auto iter = list.begin();
-        while (iter.Next())
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
         {
-            auto & entry            = iter.GetValue();
-            jint vendorId           = entry.vendorId;
-            jint groupKeyIndex      = entry.groupKeyIndex;
-            jbyteArray groupKeyRoot = env->NewByteArray(entry.groupKeyRoot.size());
-            env->SetByteArrayRegion(groupKeyRoot, 0, entry.groupKeyRoot.size(),
-                                    reinterpret_cast<const jbyte *>(entry.groupKeyRoot.data()));
-            jlong groupKeyEpochStartTime = entry.groupKeyEpochStartTime;
-            jint groupKeySecurityPolicy  = entry.groupKeySecurityPolicy;
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterRemoveSceneResponseCallback * cppCallback = nullptr;
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, groupKeyIndex, groupKeyRoot,
-                                                  groupKeyEpochStartTime, groupKeySecurityPolicy);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupKeysAttribute object"));
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding GroupKeysAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            cppCallback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-private:
-    jobject javaCallbackRef;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneId)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<MediaInputMediaInputListListAttributeCallback>
+class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
 {
-public:
-    CHIPMediaInputMediaInputListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<MediaInputMediaInputListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPScenesClusterStoreSceneResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterStoreSceneResponseCallback * cppCallback = nullptr;
+
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneId)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
         }
-    }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
+{
+    public:
+        CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPScenesClusterViewSceneResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
+
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
+            UtfString sceneNameStr(env, sceneName);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneId)
+                                , static_cast<jint>(transitionTime)
+                                , sceneNameStr.jniValue()
+                // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
         jobject javaCallbackRef;
+};
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callback<TvChannelClusterChangeChannelResponseCallback>
+{
+    public:
+        CHIPTvChannelClusterChangeChannelResponseCallback(jobject javaCallback): Callback::Callback<TvChannelClusterChangeChannelResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPMediaInputMediaInputListAttributeCallback *>(context));
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+        ~CHIPTvChannelClusterChangeChannelResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+        static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t *  ChannelMatch, uint8_t ErrorType)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPTvChannelClusterChangeChannelResponseCallback * cppCallback = nullptr;
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            cppCallback = reinterpret_cast<CHIPTvChannelClusterChangeChannelResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;Ljava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find MediaInputListAttribute constructor"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry   = iter.GetValue();
-            jint index     = entry.index;
-            jint inputType = entry.inputType;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
-            UtfString descriptionStr(env, entry.description);
-            jstring description(descriptionStr.jniValue());
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, inputType, name, description);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create MediaInputListAttribute object"));
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding MediaInputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+                , static_cast<jint>(ErrorType)
+                            );
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsFabricsListAttributeCallback
-    : public Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>
+class CHIPTargetNavigatorClusterNavigateTargetResponseCallback : public Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>
 {
-public:
-    CHIPOperationalCredentialsFabricsListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback): Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPTargetNavigatorClusterNavigateTargetResponseCallback * cppCallback = nullptr;
+            UtfString dataStr(env, data);
+            
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            cppCallback = reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPOperationalCredentialsFabricsListAttributeCallback *>(context));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+            SuccessOrExit(err);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(status)
+                                , dataStr.jniValue()
+            );
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl, "Could not find class chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[BIJJLjava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
 
-        auto iter = list.begin();
-        while (iter.Next())
+class CHIPTestClusterClusterTestAddArgumentsResponseCallback : public Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>
+{
+    public:
+        CHIPTestClusterClusterTestAddArgumentsResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>(CallbackFn, this)
         {
-            auto & entry             = iter.GetValue();
-            jint fabricIndex         = entry.fabricIndex;
-            jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
-            env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(),
-                                    reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
-            jint vendorId  = entry.vendorId;
-            jlong fabricId = entry.fabricId;
-            jlong nodeId   = entry.nodeId;
-            UtfString labelStr(env, entry.label);
-            jstring label(labelStr.jniValue());
-
-            jobject attributeObj =
-                env->NewObject(attributeClass, attributeCtor, fabricIndex, rootPublicKey, vendorId, fabricId, nodeId, label);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        ~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, uint8_t returnValue)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPTestClusterClusterTestAddArgumentsResponseCallback * cppCallback = nullptr;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
+
+
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(returnValue)
+                            );
+
+
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
-    : public Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
+<<<<<<< HEAD
+class CHIPTestClusterClusterTestEnumsResponseCallback : public Callback::Callback<TestClusterClusterTestEnumsResponseCallback>
 {
 public:
-    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback) :
-        Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>(CallbackFn, this)
+    CHIPTestClusterClusterTestEnumsResponseCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterClusterTestEnumsResponseCallback>(CallbackFn, this)
     {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         if (env == nullptr)
@@ -7669,139 +5683,132 @@ class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
             ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
     }
+    ~CHIPTestClusterClusterTestEnumsResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+    static void CallbackFn(void * context, chip::VendorId arg1, uint8_t arg2)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTestClusterClusterTestEnumsResponseCallback * cppCallback = nullptr;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        std::unique_ptr<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context));
+        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestEnumsResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(arg1), static_cast<jint>(arg2));
 
-        auto iter = list.begin();
-        while (iter.Next())
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            auto & entry                       = iter.GetValue();
-            jbyteArray trustedRootCertificates = env->NewByteArray(entry.size());
-            env->SetByteArrayRegion(trustedRootCertificates, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, trustedRootCertificates);
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding TrustedRootCertificatesAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
     }
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
-    : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
+class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
+    : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
+=======
+class CHIPTestClusterClusterTestListInt8UReverseResponseCallback : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
-public:
-    CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback) :
-        Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
+        ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+        static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t *  arg1)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPTestClusterClusterTestListInt8UReverseResponseCallback * cppCallback = nullptr;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context));
+            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
+            SuccessOrExit(err);
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor     = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeBatteryFaults);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ActiveBatteryFaultsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                // Conversion from this type to Java is not properly implemented yet
+            );
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
 
-private:
-    jobject javaCallbackRef;
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<TvChannelTvChannelListListAttributeCallback>
+class CHIPTestClusterClusterTestNullableOptionalResponseCallback
+    : public Callback::Callback<TestClusterClusterTestNullableOptionalResponseCallback>
 {
 public:
-    CHIPTvChannelTvChannelListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<TvChannelTvChannelListListAttributeCallback>(CallbackFn, this)
+    CHIPTestClusterClusterTestNullableOptionalResponseCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterClusterTestNullableOptionalResponseCallback>(CallbackFn, this)
     {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         if (env == nullptr)
@@ -7816,525 +5823,1452 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
             ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
     }
+    ~CHIPTestClusterClusterTestNullableOptionalResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
+    static void CallbackFn(void * context, bool wasPresent, bool wasNull, uint8_t value, uint8_t originalValue)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
         JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTestClusterClusterTestNullableOptionalResponseCallback * cppCallback = nullptr;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-        std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPTvChannelTvChannelListAttributeCallback *>(context));
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestNullableOptionalResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ZZII)V", &javaMethod);
+        SuccessOrExit(err);
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor =
-            env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TvChannelListAttribute constructor"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(wasPresent), static_cast<jboolean>(wasNull),
+                            static_cast<jint>(value), static_cast<jint>(originalValue));
 
-        auto iter = list.begin();
-        while (iter.Next())
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            auto & entry     = iter.GetValue();
-            jint majorNumber = entry.majorNumber;
-            jint minorNumber = entry.minorNumber;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
-            UtfString callSignStr(env, entry.callSign);
-            jstring callSign(callSignStr.jniValue());
-            UtfString affiliateCallSignStr(env, entry.affiliateCallSign);
-            jstring affiliateCallSign(affiliateCallSignStr.jniValue());
-
-            jobject attributeObj =
-                env->NewObject(attributeClass, attributeCtor, majorNumber, minorNumber, name, callSign, affiliateCallSign);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TvChannelListAttribute object"));
-
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding TvChannelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
     }
 
 private:
     jobject javaCallbackRef;
 };
 
-class CHIPTargetNavigatorTargetNavigatorListAttributeCallback
-    : public Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>
+class CHIPTestClusterClusterTestSpecificResponseCallback : public Callback::Callback<TestClusterClusterTestSpecificResponseCallback>
 {
-public:
-    CHIPTargetNavigatorTargetNavigatorListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestSpecificResponseCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
+        ~CHIPTestClusterClusterTestSpecificResponseCallback()
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+            env->DeleteGlobalRef(javaCallbackRef);
+        };
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, uint8_t returnValue)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+            jmethodID javaMethod;
+            CHIPTestClusterClusterTestSpecificResponseCallback * cppCallback = nullptr;
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context);
+            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-        std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPTargetNavigatorTargetNavigatorListAttributeCallback *>(context));
+            javaCallbackRef = cppCallback->javaCallbackRef;
+            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            SuccessOrExit(err);
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            env->CallVoidMethod(javaCallbackRef, javaMethod
+                , static_cast<jint>(returnValue)
+                            );
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl,
-                "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
 
-        auto iter = list.begin();
-        while (iter.Next())
+        exit:
+            if (err != CHIP_NO_ERROR) {
+                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+            }
+            if (cppCallback != nullptr) {
+                cppCallback->Cancel();
+                delete cppCallback;
+            }
+        }
+        
+    private:
+        jobject javaCallbackRef;
+};
+
+
+class CHIPApplicationLauncherApplicationLauncherListAttributeCallback : public Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>
+{
+    public:
+        CHIPApplicationLauncherApplicationLauncherListAttributeCallback(jobject javaCallback): Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list)
         {
-            auto & entry    = iter.GetValue();
-            jint identifier = entry.identifier;
-            UtfString nameStr(env, entry.name);
-            jstring name(nameStr.jniValue());
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback> cppCallback(reinterpret_cast<CHIPApplicationLauncherApplicationLauncherListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, identifier, name);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, applicationLauncherList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ApplicationLauncherListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>
+{
+    public:
+        CHIPAudioOutputAudioOutputListAttributeCallback(jobject javaCallback): Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback> cppCallback(reinterpret_cast<CHIPAudioOutputAudioOutputListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(IILjava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint index = entry.index;
+                                jint outputType = entry.outputType;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    index, 
+                    outputType, 
+                    name
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPBridgedActionsActionListAttributeCallback : public Callback::Callback<BridgedActionsActionListListAttributeCallback>
+{
+    public:
+        CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback): Callback::Callback<BridgedActionsActionListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback> cppCallback(reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(ILjava/lang/String;IIII)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ActionListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint actionID = entry.actionID;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+                jint type = entry.type;
+                                jint endpointListID = entry.endpointListID;
+                                jint supportedCommands = entry.supportedCommands;
+                                jint status = entry.status;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    actionID, 
+                    name, 
+                    type, 
+                    endpointListID, 
+                    supportedCommands, 
+                    status
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ActionListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActionListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<TestClusterListInt8uListAttributeCallback>
+class CHIPBridgedActionsEndpointListAttributeCallback : public Callback::Callback<BridgedActionsEndpointListListAttributeCallback>
 {
-public:
-    CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterListInt8uListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+    public:
+        CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback): Callback::Callback<BridgedActionsEndpointListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback> cppCallback(reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(ILjava/lang/String;I[B)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find EndpointListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint endpointListID = entry.endpointListID;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+                jint type = entry.type;
+                                jbyteArray endpoints = env->NewByteArray(entry.endpoints.size());
+                env->SetByteArrayRegion(endpoints, 0, entry.endpoints.size(), reinterpret_cast<const jbyte *>(entry.endpoints.data()));
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    endpointListID, 
+                    name, 
+                    type, 
+                    endpoints
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create EndpointListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding EndpointListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+class CHIPContentLauncherAcceptsHeaderListAttributeCallback : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
+{
+    public:
+        CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback): Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context));
+            std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject listInt8u       = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listInt8u);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ListInt8uAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jbyteArray acceptsHeaderList = env->NewByteArray(entry.size());
+                env->SetByteArrayRegion(acceptsHeaderList, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AcceptsHeaderListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-private:
-    jobject javaCallbackRef;
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callback<TestClusterListOctetStringListAttributeCallback>
+class CHIPContentLauncherSupportedStreamingTypesAttributeCallback : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
 {
-public:
-    CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterListOctetStringListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback): Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
 
-        std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding SupportedStreamingTypesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<DescriptorDeviceListListAttributeCallback>
+{
+    public:
+        CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorDeviceListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(JI)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find DeviceListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jlong type = entry.type;
+                                jint revision = entry.revision;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    type, 
+                    revision
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create DeviceListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding DeviceListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<DescriptorServerListListAttributeCallback>
+{
+    public:
+        CHIPDescriptorServerListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorServerListListAttributeCallback>(CallbackFn, this)
         {
-            auto & entry               = iter.GetValue();
-            jbyteArray listOctetString = env->NewByteArray(entry.size());
-            env->SetByteArrayRegion(listOctetString, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listOctetString);
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding ListOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-private:
-    jobject javaCallbackRef;
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPDescriptorServerListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
+                jobject serverList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, serverList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ServerListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPTestClusterListStructOctetStringAttributeCallback
-    : public Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>
+class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<DescriptorClientListListAttributeCallback>
 {
-public:
-    CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback) :
-        Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDescriptorClientListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorClientListListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
-
-    static void CallbackFn(
-        void * context,
-        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
-            list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-        std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context));
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            std::unique_ptr<CHIPDescriptorClientListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl, "Could not find class chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(J[B)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ListStructOctetStringAttribute constructor"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry               = iter.GetValue();
-            jlong fabricIndex          = entry.fabricIndex;
-            jbyteArray operationalCert = env->NewByteArray(entry.operationalCert.size());
-            env->SetByteArrayRegion(operationalCert, 0, entry.operationalCert.size(),
-                                    reinterpret_cast<const jbyte *>(entry.operationalCert.data()));
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, fabricIndex, operationalCert);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ListStructOctetStringAttribute object"));
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
+                jobject clientList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, clientList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ClientListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding ListStructOctetStringAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
-
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
-
-private:
-    jobject javaCallbackRef;
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
-    : public Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
+class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<DescriptorPartsListListAttributeCallback>
 {
-public:
-    CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPDescriptorPartsListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorPartsListListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPDescriptorPartsListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context));
 
-        std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(Zcl,
-                         "Could not find class "
-                         "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JJIJJIIIIIZZZZ)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NeighborTableListAttribute constructor"));
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject partsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, partsList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding PartsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry              = iter.GetValue();
-            jlong extAddress          = entry.extAddress;
-            jlong age                 = entry.age;
-            jint rloc16               = entry.rloc16;
-            jlong linkFrameCounter    = entry.linkFrameCounter;
-            jlong mleFrameCounter     = entry.mleFrameCounter;
-            jint lqi                  = entry.lqi;
-            jint averageRssi          = entry.averageRssi;
-            jint lastRssi             = entry.lastRssi;
-            jint frameErrorRate       = entry.frameErrorRate;
-            jint messageErrorRate     = entry.messageErrorRate;
-            jboolean rxOnWhenIdle     = entry.rxOnWhenIdle;
-            jboolean fullThreadDevice = entry.fullThreadDevice;
-            jboolean fullNetworkData  = entry.fullNetworkData;
-            jboolean isChild          = entry.isChild;
-
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, age, rloc16, linkFrameCounter,
-                                                  mleFrameCounter, lqi, averageRssi, lastRssi, frameErrorRate, messageErrorRate,
-                                                  rxOnWhenIdle, fullThreadDevice, fullNetworkData, isChild);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NeighborTableListAttribute object"));
-
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding NeighborTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<FixedLabelLabelListListAttributeCallback>
+{
+    public:
+        CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback): Callback::Callback<FixedLabelLabelListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback> cppCallback(reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(Ljava/lang/String;Ljava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                UtfString labelStr(env, entry.label);
+                jstring label(labelStr.jniValue());
+                UtfString valueStr(env, entry.value);
+                jstring value(valueStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    label, 
+                    value
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback : public Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>
+{
+    public:
+        CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback> cppCallback(reinterpret_cast<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(J)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find BasicCommissioningInfoListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jlong failSafeExpiryLengthMs = entry.failSafeExpiryLengthMs;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    failSafeExpiryLengthMs
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create BasicCommissioningInfoListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding BasicCommissioningInfoListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback : public Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
+{
+    public:
+        CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback): Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback> cppCallback(reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(Ljava/lang/String;ZZZ[BI)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NetworkInterfacesAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+                jboolean fabricConnected = entry.fabricConnected;
+                                jboolean offPremiseServicesReachableIPv4 = entry.offPremiseServicesReachableIPv4;
+                                jboolean offPremiseServicesReachableIPv6 = entry.offPremiseServicesReachableIPv6;
+                                jbyteArray hardwareAddress = env->NewByteArray(entry.hardwareAddress.size());
+                env->SetByteArrayRegion(hardwareAddress, 0, entry.hardwareAddress.size(), reinterpret_cast<const jbyte *>(entry.hardwareAddress.data()));
+                jint type = entry.type;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    name, 
+                    fabricConnected, 
+                    offPremiseServicesReachableIPv4, 
+                    offPremiseServicesReachableIPv6, 
+                    hardwareAddress, 
+                    type
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NetworkInterfacesAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding NetworkInterfacesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>
+{
+    public:
+        CHIPGroupKeyManagementGroupsAttributeCallback(jobject javaCallback): Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback> cppCallback(reinterpret_cast<CHIPGroupKeyManagementGroupsAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(III)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint vendorId = entry.vendorId;
+                                jint vendorGroupId = entry.vendorGroupId;
+                                jint groupKeySetIndex = entry.groupKeySetIndex;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    vendorId, 
+                    vendorGroupId, 
+                    groupKeySetIndex
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
-    : public Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
+class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>
+{
+    public:
+        CHIPGroupKeyManagementGroupKeysAttributeCallback(jobject javaCallback): Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback> cppCallback(reinterpret_cast<CHIPGroupKeyManagementGroupKeysAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(II[BJI)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupKeysAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint vendorId = entry.vendorId;
+                                jint groupKeyIndex = entry.groupKeyIndex;
+                                jbyteArray groupKeyRoot = env->NewByteArray(entry.groupKeyRoot.size());
+                env->SetByteArrayRegion(groupKeyRoot, 0, entry.groupKeyRoot.size(), reinterpret_cast<const jbyte *>(entry.groupKeyRoot.data()));
+                jlong groupKeyEpochStartTime = entry.groupKeyEpochStartTime;
+                                jint groupKeySecurityPolicy = entry.groupKeySecurityPolicy;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    vendorId, 
+                    groupKeyIndex, 
+                    groupKeyRoot, 
+                    groupKeyEpochStartTime, 
+                    groupKeySecurityPolicy
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupKeysAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupKeysAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<MediaInputMediaInputListListAttributeCallback>
+{
+    public:
+        CHIPMediaInputMediaInputListAttributeCallback(jobject javaCallback): Callback::Callback<MediaInputMediaInputListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback> cppCallback(reinterpret_cast<CHIPMediaInputMediaInputListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(IILjava/lang/String;Ljava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find MediaInputListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint index = entry.index;
+                                jint inputType = entry.inputType;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+                UtfString descriptionStr(env, entry.description);
+                jstring description(descriptionStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    index, 
+                    inputType, 
+                    name, 
+                    description
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create MediaInputListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding MediaInputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPOperationalCredentialsFabricsListAttributeCallback : public Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>
+{
+    public:
+        CHIPOperationalCredentialsFabricsListAttributeCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback> cppCallback(reinterpret_cast<CHIPOperationalCredentialsFabricsListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(I[BIJJLjava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint fabricIndex = entry.fabricIndex;
+                                jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
+                env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(), reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
+                jint vendorId = entry.vendorId;
+                                jlong fabricId = entry.fabricId;
+                                jlong nodeId = entry.nodeId;
+                                UtfString labelStr(env, entry.label);
+                jstring label(labelStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    fabricIndex, 
+                    rootPublicKey, 
+                    vendorId, 
+                    fabricId, 
+                    nodeId, 
+                    label
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+<<<<<<< HEAD
+class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
+    : public Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
 {
 public:
-    CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(CallbackFn, this)
+    CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>(CallbackFn, this)
     {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         if (env == nullptr)
@@ -8350,9 +7284,7 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
         }
     }
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8361,8 +7293,8 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
 
         VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context));
+        std::unique_ptr<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback *>(context));
 
         // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
         javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -8384,42 +7316,17 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl,
-                "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JIIIIIIIZZ)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find RouteTableListAttribute constructor"));
-
         auto iter = list.begin();
         while (iter.Next())
         {
-            auto & entry             = iter.GetValue();
-            jlong extAddress         = entry.extAddress;
-            jint rloc16              = entry.rloc16;
-            jint routerId            = entry.routerId;
-            jint nextHop             = entry.nextHop;
-            jint pathCost            = entry.pathCost;
-            jint LQIIn               = entry.LQIIn;
-            jint LQIOut              = entry.LQIOut;
-            jint age                 = entry.age;
-            jboolean allocated       = entry.allocated;
-            jboolean linkEstablished = entry.linkEstablished;
-
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, rloc16, routerId, nextHop, pathCost,
-                                                  LQIIn, LQIOut, age, allocated, linkEstablished);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create RouteTableListAttribute object"));
-
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            auto & entry                       = iter.GetValue();
+            jbyteArray trustedRootCertificates = env->NewByteArray(entry.size());
+            env->SetByteArrayRegion(trustedRootCertificates, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, trustedRootCertificates);
         }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding RouteTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding TrustedRootCertificatesAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8429,289 +7336,906 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
     jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
-    : public Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>
-{
-public:
-    CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
+    : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
+=======
+class CHIPPowerSourceActiveBatteryFaultsAttributeCallback : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
+>>>>>>> e83b94d19 (need to wait for cast-helper)
+{
+    public:
+        CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback): Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback> cppCallback(reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeBatteryFaults);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActiveBatteryFaultsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<TvChannelTvChannelListListAttributeCallback>
+{
+    public:
+        CHIPTvChannelTvChannelListAttributeCallback(jobject javaCallback): Callback::Callback<TvChannelTvChannelListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback> cppCallback(reinterpret_cast<CHIPTvChannelTvChannelListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TvChannelListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint majorNumber = entry.majorNumber;
+                                jint minorNumber = entry.minorNumber;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+                UtfString callSignStr(env, entry.callSign);
+                jstring callSign(callSignStr.jniValue());
+                UtfString affiliateCallSignStr(env, entry.affiliateCallSign);
+                jstring affiliateCallSign(affiliateCallSignStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    majorNumber, 
+                    minorNumber, 
+                    name, 
+                    callSign, 
+                    affiliateCallSign
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TvChannelListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TvChannelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-    static void CallbackFn(void * context,
-                           const chip::app::DataModel::DecodableList<
-                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+class CHIPTargetNavigatorTargetNavigatorListAttributeCallback : public Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>
+{
+    public:
+        CHIPTargetNavigatorTargetNavigatorListAttributeCallback(jobject javaCallback): Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback> cppCallback(reinterpret_cast<CHIPTargetNavigatorTargetNavigatorListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(ILjava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint identifier = entry.identifier;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    identifier, 
+                    name
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
         jobject javaCallbackRef;
+};
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<TestClusterListInt8uListAttributeCallback>
+{
+    public:
+        CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListInt8uListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context));
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute", attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl,
-                "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II)V");
-        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find SecurityPolicyAttribute constructor"));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry      = iter.GetValue();
-            jint rotationTime = entry.rotationTime;
-            jint flags        = entry.flags;
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, rotationTime, flags);
-            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create SecurityPolicyAttribute object"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-        }
-        VerifyOrReturn(
-            iter.GetStatus() == CHIP_NO_ERROR,
-            ChipLogError(Zcl, "Error decoding SecurityPolicyAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject listInt8u = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listInt8u);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListInt8uAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-private:
-    jobject javaCallbackRef;
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
-    : public Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>
+class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callback<TestClusterListOctetStringListAttributeCallback>
 {
-public:
-    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListOctetStringListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-        }
-    }
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<
-                   chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context));
 
-        std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        jclass attributeClass;
-        err = JniReferences::GetInstance().GetClassRef(
-            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute",
-            attributeClass);
-        VerifyOrReturn(
-            err == CHIP_NO_ERROR,
-            ChipLogError(
-                Zcl,
-                "Could not find class "
-                "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute"));
-        JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ZZZZZZZZZZZZ)V");
-        VerifyOrReturn(attributeCtor != nullptr,
-                       ChipLogError(Zcl, "Could not find OperationalDatasetComponentsAttribute constructor"));
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jbyteArray listOctetString = env->NewByteArray(entry.size());
+                env->SetByteArrayRegion(listOctetString, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listOctetString);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry                     = iter.GetValue();
-            jboolean activeTimestampPresent  = entry.activeTimestampPresent;
-            jboolean pendingTimestampPresent = entry.pendingTimestampPresent;
-            jboolean masterKeyPresent        = entry.masterKeyPresent;
-            jboolean networkNamePresent      = entry.networkNamePresent;
-            jboolean extendedPanIdPresent    = entry.extendedPanIdPresent;
-            jboolean meshLocalPrefixPresent  = entry.meshLocalPrefixPresent;
-            jboolean delayPresent            = entry.delayPresent;
-            jboolean panIdPresent            = entry.panIdPresent;
-            jboolean channelPresent          = entry.channelPresent;
-            jboolean pskcPresent             = entry.pskcPresent;
-            jboolean securityPolicyPresent   = entry.securityPolicyPresent;
-            jboolean channelMaskPresent      = entry.channelMaskPresent;
-
-            jobject attributeObj =
-                env->NewObject(attributeClass, attributeCtor, activeTimestampPresent, pendingTimestampPresent, masterKeyPresent,
-                               networkNamePresent, extendedPanIdPresent, meshLocalPrefixPresent, delayPresent, panIdPresent,
-                               channelPresent, pskcPresent, securityPolicyPresent, channelMaskPresent);
-            VerifyOrReturn(attributeObj != nullptr,
-                           ChipLogError(Zcl, "Could not create OperationalDatasetComponentsAttribute object"));
-
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
         }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding OperationalDatasetComponentsAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPTestClusterListStructOctetStringAttributeCallback : public Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>
+{
+    public:
+        CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(J[B)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ListStructOctetStringAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jlong fabricIndex = entry.fabricIndex;
+                                jbyteArray operationalCert = env->NewByteArray(entry.operationalCert.size());
+                env->SetByteArrayRegion(operationalCert, 0, entry.operationalCert.size(), reinterpret_cast<const jbyte *>(entry.operationalCert.data()));
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    fabricIndex, 
+                    operationalCert
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ListStructOctetStringAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListStructOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
+{
+    public:
+        CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(JJIJJIIIIIZZZZ)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NeighborTableListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jlong extAddress = entry.extAddress;
+                                jlong age = entry.age;
+                                jint rloc16 = entry.rloc16;
+                                jlong linkFrameCounter = entry.linkFrameCounter;
+                                jlong mleFrameCounter = entry.mleFrameCounter;
+                                jint lqi = entry.lqi;
+                                jint averageRssi = entry.averageRssi;
+                                jint lastRssi = entry.lastRssi;
+                                jint frameErrorRate = entry.frameErrorRate;
+                                jint messageErrorRate = entry.messageErrorRate;
+                                jboolean rxOnWhenIdle = entry.rxOnWhenIdle;
+                                jboolean fullThreadDevice = entry.fullThreadDevice;
+                                jboolean fullNetworkData = entry.fullNetworkData;
+                                jboolean isChild = entry.isChild;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    extAddress, 
+                    age, 
+                    rloc16, 
+                    linkFrameCounter, 
+                    mleFrameCounter, 
+                    lqi, 
+                    averageRssi, 
+                    lastRssi, 
+                    frameErrorRate, 
+                    messageErrorRate, 
+                    rxOnWhenIdle, 
+                    fullThreadDevice, 
+                    fullNetworkData, 
+                    isChild
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NeighborTableListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding NeighborTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
+
+class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
+{
+    public:
+        CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(JIIIIIIIZZ)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find RouteTableListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jlong extAddress = entry.extAddress;
+                                jint rloc16 = entry.rloc16;
+                                jint routerId = entry.routerId;
+                                jint nextHop = entry.nextHop;
+                                jint pathCost = entry.pathCost;
+                                jint LQIIn = entry.LQIIn;
+                                jint LQIOut = entry.LQIOut;
+                                jint age = entry.age;
+                                jboolean allocated = entry.allocated;
+                                jboolean linkEstablished = entry.linkEstablished;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    extAddress, 
+                    rloc16, 
+                    routerId, 
+                    nextHop, 
+                    pathCost, 
+                    LQIIn, 
+                    LQIOut, 
+                    age, 
+                    allocated, 
+                    linkEstablished
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create RouteTableListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding RouteTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>
+{
+    public:
+        CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(II)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find SecurityPolicyAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint rotationTime = entry.rotationTime;
+                                jint flags = entry.flags;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    rotationTime, 
+                    flags
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create SecurityPolicyAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding SecurityPolicyAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
+};
 
-private:
-    jobject javaCallbackRef;
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>
+{
+    public:
+        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
+        }
+
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
+
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+            std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context));
+
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(ZZZZZZZZZZZZ)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find OperationalDatasetComponentsAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jboolean activeTimestampPresent = entry.activeTimestampPresent;
+                                jboolean pendingTimestampPresent = entry.pendingTimestampPresent;
+                                jboolean masterKeyPresent = entry.masterKeyPresent;
+                                jboolean networkNamePresent = entry.networkNamePresent;
+                                jboolean extendedPanIdPresent = entry.extendedPanIdPresent;
+                                jboolean meshLocalPrefixPresent = entry.meshLocalPrefixPresent;
+                                jboolean delayPresent = entry.delayPresent;
+                                jboolean panIdPresent = entry.panIdPresent;
+                                jboolean channelPresent = entry.channelPresent;
+                                jboolean pskcPresent = entry.pskcPresent;
+                                jboolean securityPolicyPresent = entry.securityPolicyPresent;
+                                jboolean channelMaskPresent = entry.channelMaskPresent;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    activeTimestampPresent, 
+                    pendingTimestampPresent, 
+                    masterKeyPresent, 
+                    networkNamePresent, 
+                    extendedPanIdPresent, 
+                    meshLocalPrefixPresent, 
+                    delayPresent, 
+                    panIdPresent, 
+                    channelPresent, 
+                    pskcPresent, 
+                    securityPolicyPresent, 
+                    channelMaskPresent
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create OperationalDatasetComponentsAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding OperationalDatasetComponentsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
-    : public Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
 {
-public:
-    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(CallbackFn, this)
-    {
-        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-        if (env == nullptr)
+    public:
+        CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(CallbackFn, this)
         {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
-            return;
-        }
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
 
-        javaCallbackRef = env->NewGlobalRef(javaCallback);
-        if (javaCallbackRef == nullptr)
-        {
-            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
+            if (javaCallbackRef == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+            }
         }
-    }
 
-    static void
-    CallbackFn(void * context,
-               const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
-    {
-        chip::DeviceLayer::StackUnlock unlock;
-        CHIP_ERROR err = CHIP_NO_ERROR;
-        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
-        jobject javaCallbackRef;
+        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
+        {
+            chip::DeviceLayer::StackUnlock unlock;
+            CHIP_ERROR err = CHIP_NO_ERROR;
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            jobject javaCallbackRef;
 
-        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context));
+            std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context));
 
-        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-        javaCallbackRef = cppCallback.get()->javaCallbackRef;
-        VerifyOrReturn(javaCallbackRef != nullptr,
-                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+            javaCallbackRef = cppCallback.get()->javaCallbackRef;
+            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        jclass arrayListClass;
-        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-        JniClass arrayListJniClass(arrayListClass);
-        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
-        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
-                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+            jclass arrayListClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+            JniClass arrayListJniClass(arrayListClass);
+            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
+            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
 
-        jmethodID javaMethod;
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+            jmethodID javaMethod;
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        auto iter = list.begin();
-        while (iter.Next())
-        {
-            auto & entry = iter.GetValue();
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeNetworkFaultsList);
-        }
-        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
-                       ChipLogError(Zcl, "Error decoding ActiveNetworkFaultsListAttribute value: %" CHIP_ERROR_FORMAT,
-                                    iter.GetStatus().Format()));
 
-        env->ExceptionClear();
-        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-    }
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jclass entryTypeCls;
+                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+                jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeNetworkFaultsList);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActiveNetworkFaultsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
-private:
-    jobject javaCallbackRef;
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+        }
+            
+    private:
+        jobject javaCallbackRef;
 };
 
+
 JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlong clusterPtr)
 {
     chip::DeviceLayer::StackLock lock;
     ClusterBase * cluster = reinterpret_cast<ClusterBase *>(clusterPtr);
-    if (cluster != nullptr)
-    {
+    if (cluster != nullptr) {
         delete cluster;
     }
 }
@@ -8725,106 +8249,86 @@ JNI_METHOD(jlong, AccountLoginCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AccountLoginCluster, getSetupPIN)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier)
+JNI_METHOD(void, AccountLoginCluster, getSetupPIN)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
-
+    
     JniUtfString tempAccountIdentifierStr(env, tempAccountIdentifier);
-
-    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback,
-                    void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)>
-        onSuccess(Platform::New<CHIPAccountLoginClusterGetSetupPINResponseCallback>(callback),
-                  Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback, void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)> onSuccess(
+        Platform::New<CHIPAccountLoginClusterGetSetupPINResponseCallback>(callback), Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(),
-                                  chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())));
+    err = cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AccountLoginCluster, login)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN)
+JNI_METHOD(void, AccountLoginCluster, login)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
-
+    
     JniUtfString tempAccountIdentifierStr(env, tempAccountIdentifier);
-    JniUtfString setupPINStr(env, setupPIN);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        JniUtfString setupPINStr(env, setupPIN);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(),
-                            chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())),
-                            chip::CharSpan(setupPINStr.c_str(), strlen(setupPINStr.c_str())));
+    err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())), chip::CharSpan(setupPINStr.c_str(), strlen(setupPINStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -8833,20 +8337,15 @@ JNI_METHOD(void, AccountLoginCluster, login)
 JNI_METHOD(void, AccountLoginCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8863,17 +8362,15 @@ JNI_METHOD(jlong, AdministratorCommissioningCluster, initWithDevice)(JNIEnv * en
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout)
+JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8883,98 +8380,79 @@ JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow
     err = cppCluster->OpenBasicCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout, jbyteArray PAKEVerifier,
- jint discriminator, jlong iterations, jbyteArray salt, jint passcodeID)
+JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout, jbyteArray PAKEVerifier, jint discriminator, jlong iterations, jbyteArray salt, jint passcodeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
-
+    
     JniByteArray PAKEVerifierArr(env, PAKEVerifier);
     JniByteArray saltArr(env, salt);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AdministratorCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->OpenCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout,
-                                              chip::ByteSpan((const uint8_t *) PAKEVerifierArr.data(), PAKEVerifierArr.size()),
-                                              discriminator, iterations,
-                                              chip::ByteSpan((const uint8_t *) saltArr.data(), saltArr.size()), passcodeID);
+    err = cppCluster->OpenCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout, chip::ByteSpan((const uint8_t*) PAKEVerifierArr.data(), PAKEVerifierArr.size()), discriminator, iterations, chip::ByteSpan((const uint8_t*) saltArr.data(), saltArr.size()), passcodeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8984,52 +8462,41 @@ JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)
     err = cppCluster->RevokeCommissioning(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster = reinterpret_cast<AdministratorCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9051,11 +8518,10 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9065,29 +8531,24 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
     err = cppCluster->ChangeStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(status));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -9096,20 +8557,16 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
 JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9121,20 +8578,15 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env,
 JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9143,24 +8595,19 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9172,20 +8619,15 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)
 JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9194,24 +8636,19 @@ JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9220,24 +8657,18 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCatalogVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9246,24 +8677,18 @@ JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9272,24 +8697,18 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9306,80 +8725,63 @@ JNI_METHOD(jlong, ApplicationLauncherCluster, initWithDevice)(JNIEnv * env, jobj
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, launchApp)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jint catalogVendorId, jstring applicationId)
+JNI_METHOD(void, ApplicationLauncherCluster, launchApp)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jint catalogVendorId, jstring applicationId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster;
-
+    
     JniUtfString dataStr(env, data);
-    JniUtfString applicationIdStr(env, applicationId);
-
-    std::unique_ptr<CHIPApplicationLauncherClusterLaunchAppResponseCallback,
-                    void (*)(CHIPApplicationLauncherClusterLaunchAppResponseCallback *)>
-        onSuccess(Platform::New<CHIPApplicationLauncherClusterLaunchAppResponseCallback>(callback),
-                  Platform::Delete<CHIPApplicationLauncherClusterLaunchAppResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        JniUtfString applicationIdStr(env, applicationId);
+    
+    std::unique_ptr<CHIPApplicationLauncherClusterLaunchAppResponseCallback, void (*)(CHIPApplicationLauncherClusterLaunchAppResponseCallback *)> onSuccess(
+        Platform::New<CHIPApplicationLauncherClusterLaunchAppResponseCallback>(callback), Platform::Delete<CHIPApplicationLauncherClusterLaunchAppResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())),
-                                catalogVendorId, chip::CharSpan(applicationIdStr.c_str(), strlen(applicationIdStr.c_str())));
+    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())), catalogVendorId, chip::CharSpan(applicationIdStr.c_str(), strlen(applicationIdStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback,
-                    void (*)(CHIPApplicationLauncherApplicationLauncherListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>(callback),
-                  Platform::Delete<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback, void (*)(CHIPApplicationLauncherApplicationLauncherListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>(callback), Platform::Delete<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationLauncherList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9388,24 +8790,18 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCatalogVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9414,24 +8810,18 @@ JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9440,24 +8830,18 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9474,52 +8858,43 @@ JNI_METHOD(jlong, AudioOutputCluster, initWithDevice)(JNIEnv * env, jobject self
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AudioOutputCluster, renameOutput)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
+JNI_METHOD(void, AudioOutputCluster, renameOutput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
-
+    
     JniUtfString nameStr(env, name);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index,
-                                   chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
+    err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -9529,11 +8904,10 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9543,29 +8917,24 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
     err = cppCluster->SelectOutput(onSuccess->Cancel(), onFailure->Cancel(), index);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -9574,21 +8943,16 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
 JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback, void (*)(CHIPAudioOutputAudioOutputListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPAudioOutputAudioOutputListAttributeCallback>(callback),
-                  Platform::Delete<CHIPAudioOutputAudioOutputListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback, void (*)(CHIPAudioOutputAudioOutputListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPAudioOutputAudioOutputListAttributeCallback>(callback), Platform::Delete<CHIPAudioOutputAudioOutputListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAudioOutputList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9597,24 +8961,18 @@ JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentAudioOutput(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9626,20 +8984,15 @@ JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)
 JNI_METHOD(void, AudioOutputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9656,17 +9009,15 @@ JNI_METHOD(jlong, BarrierControlCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint percentOpen)
+JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint percentOpen)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9676,29 +9027,24 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)
     err = cppCluster->BarrierControlGoToPercent(onSuccess->Cancel(), onFailure->Cancel(), percentOpen);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -9708,11 +9054,10 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobjec
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9722,52 +9067,41 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobjec
     err = cppCluster->BarrierControlStop(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierMovingState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9776,24 +9110,18 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierSafetyStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9802,24 +9130,18 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierCapabilities(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9828,24 +9150,18 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierPosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9854,24 +9170,18 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9893,11 +9203,10 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9907,29 +9216,24 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
     err = cppCluster->MfgSpecificPing(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -9938,20 +9242,15 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
 JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInteractionModelVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9962,21 +9261,17 @@ JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * en
 
 JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9988,20 +9283,15 @@ JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10013,20 +9303,16 @@ JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self
 JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10038,20 +9324,15 @@ JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10063,20 +9344,16 @@ JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10085,28 +9362,21 @@ JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject sel
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                              chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -10116,20 +9386,16 @@ JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
 JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10138,28 +9404,21 @@ JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BasicCluster, writeLocationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-    err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(),
-                                             chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+    err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -10169,20 +9428,15 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)
 JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10194,20 +9448,16 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10219,20 +9469,15 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10244,20 +9489,16 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10269,20 +9510,16 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeManufacturingDate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10294,20 +9531,16 @@ JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, job
 JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10319,20 +9552,16 @@ JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductURL(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10344,20 +9573,16 @@ JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10369,20 +9594,16 @@ JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSerialNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10394,20 +9615,15 @@ JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocalConfigDisabled(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10416,27 +9632,21 @@ JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeLocalConfigDisabled(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -10445,20 +9655,15 @@ JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
 JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeReachable(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10470,20 +9675,15 @@ JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10500,23 +9700,19 @@ JNI_METHOD(jlong, BinaryInputBasicCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOutOfService(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10525,27 +9721,21 @@ JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOutOfService(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -10554,20 +9744,15 @@ JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
 JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10576,76 +9761,58 @@ JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, subscribePresentValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BinaryInputBasicCluster, subscribePresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                     static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
-        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributePresentValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -10653,20 +9820,15 @@ JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)
 JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10675,72 +9837,54 @@ JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, subscribeStatusFlagsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BinaryInputBasicCluster, subscribeStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                    static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, reportStatusFlagsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, reportStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeStatusFlags(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10757,17 +9901,15 @@ JNI_METHOD(jlong, BindingCluster, initWithDevice)(JNIEnv * env, jobject self, jl
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BindingCluster, bind)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
+JNI_METHOD(void, BindingCluster, bind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -10777,44 +9919,37 @@ JNI_METHOD(void, BindingCluster, bind)
     err = cppCluster->Bind(onSuccess->Cancel(), onFailure->Cancel(), nodeId, groupId, endpointId, clusterId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BindingCluster, unbind)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
+JNI_METHOD(void, BindingCluster, unbind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -10824,29 +9959,24 @@ JNI_METHOD(void, BindingCluster, unbind)
     err = cppCluster->Unbind(onSuccess->Cancel(), onFailure->Cancel(), nodeId, groupId, endpointId, clusterId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -10855,20 +9985,15 @@ JNI_METHOD(void, BindingCluster, unbind)
 JNI_METHOD(void, BindingCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err              = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster = reinterpret_cast<BindingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10885,23 +10010,19 @@ JNI_METHOD(jlong, BooleanStateCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, BooleanStateCluster, readStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10910,27 +10031,20 @@ JNI_METHOD(void, BooleanStateCluster, readStateValueAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                   static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -10940,19 +10054,15 @@ JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)
 JNI_METHOD(void, BooleanStateCluster, reportStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
-        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeStateValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -10960,20 +10070,15 @@ JNI_METHOD(void, BooleanStateCluster, reportStateValueAttribute)(JNIEnv * env, j
 JNI_METHOD(void, BooleanStateCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10990,17 +10095,15 @@ JNI_METHOD(jlong, BridgedActionsCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BridgedActionsCluster, disableAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, disableAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11010,44 +10113,37 @@ JNI_METHOD(void, BridgedActionsCluster, disableAction)
     err = cppCluster->DisableAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11057,44 +10153,37 @@ JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)
     err = cppCluster->DisableActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, enableAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, enableAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11104,44 +10193,37 @@ JNI_METHOD(void, BridgedActionsCluster, enableAction)
     err = cppCluster->EnableAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11151,44 +10233,37 @@ JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)
     err = cppCluster->EnableActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, instantAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, instantAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11198,44 +10273,37 @@ JNI_METHOD(void, BridgedActionsCluster, instantAction)
     err = cppCluster->InstantAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jint transitionTime)
+JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11245,44 +10313,37 @@ JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)
     err = cppCluster->InstantActionWithTransition(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, transitionTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, pauseAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, pauseAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11292,44 +10353,37 @@ JNI_METHOD(void, BridgedActionsCluster, pauseAction)
     err = cppCluster->PauseAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11339,44 +10393,37 @@ JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)
     err = cppCluster->PauseActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, resumeAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, resumeAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
-    BridgedActionsCluster * cppCluster;
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    BridgedActionsCluster * cppCluster;
+    
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11386,44 +10433,37 @@ JNI_METHOD(void, BridgedActionsCluster, resumeAction)
     err = cppCluster->ResumeAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, startAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, startAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11433,44 +10473,37 @@ JNI_METHOD(void, BridgedActionsCluster, startAction)
     err = cppCluster->StartAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11480,44 +10513,37 @@ JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)
     err = cppCluster->StartActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, stopAction)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, stopAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11527,29 +10553,24 @@ JNI_METHOD(void, BridgedActionsCluster, stopAction)
     err = cppCluster->StopAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -11558,21 +10579,16 @@ JNI_METHOD(void, BridgedActionsCluster, stopAction)
 JNI_METHOD(void, BridgedActionsCluster, readActionListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback, void (*)(CHIPBridgedActionsActionListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPBridgedActionsActionListAttributeCallback>(callback),
-                  Platform::Delete<CHIPBridgedActionsActionListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback, void (*)(CHIPBridgedActionsActionListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBridgedActionsActionListAttributeCallback>(callback), Platform::Delete<CHIPBridgedActionsActionListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActionList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11584,21 +10600,16 @@ JNI_METHOD(void, BridgedActionsCluster, readActionListAttribute)(JNIEnv * env, j
 JNI_METHOD(void, BridgedActionsCluster, readEndpointListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback, void (*)(CHIPBridgedActionsEndpointListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPBridgedActionsEndpointListAttributeCallback>(callback),
-                  Platform::Delete<CHIPBridgedActionsEndpointListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback, void (*)(CHIPBridgedActionsEndpointListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBridgedActionsEndpointListAttributeCallback>(callback), Platform::Delete<CHIPBridgedActionsEndpointListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEndpointList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11610,20 +10621,16 @@ JNI_METHOD(void, BridgedActionsCluster, readEndpointListAttribute)(JNIEnv * env,
 JNI_METHOD(void, BridgedActionsCluster, readSetupUrlAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSetupUrl(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11632,24 +10639,18 @@ JNI_METHOD(void, BridgedActionsCluster, readSetupUrlAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedActionsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedActionsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11666,23 +10667,20 @@ JNI_METHOD(jlong, BridgedDeviceBasicCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11694,20 +10692,15 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * en
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11716,24 +10709,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11745,20 +10733,16 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11767,52 +10751,39 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                              chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11821,24 +10792,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11847,24 +10813,18 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11873,24 +10833,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11899,24 +10854,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeManufacturingDate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11928,20 +10878,16 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11953,20 +10899,16 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * en
 JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductURL(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11975,24 +10917,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12001,24 +10938,19 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSerialNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12030,20 +10962,15 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)
 JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeReachable(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12052,24 +10979,18 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-{
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+{
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12086,66 +11007,60 @@ JNI_METHOD(jlong, ColorControlCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ColorControlCluster, colorLoopSet)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint updateFlags, jint action, jint direction, jint time,
- jint startHue, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, colorLoopSet)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint updateFlags, jint action, jint direction, jint time, jint startHue, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, static_cast<uint8_t>(action),
                                    static_cast<uint8_t>(direction), time, startHue, optionsMask, optionsOverride);
+=======
+    err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, action, direction, time, startHue, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -12156,191 +11071,167 @@ JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)
                                       optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint direction, jint transitionTime,
- jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint direction, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, static_cast<uint8_t>(direction),
                                         transitionTime, optionsMask, optionsOverride);
+=======
+    err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, direction, transitionTime, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveToHueAndSaturation)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint saturation, jint transitionTime,
- jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveToHueAndSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->EnhancedMoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, saturation,
-                                                     transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->EnhancedMoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, saturation, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedStepHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
- jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedStepHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                       transitionTime, optionsMask, optionsOverride);
+=======
+    err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveColor)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint rateX, jint rateY, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint rateX, jint rateY, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -12350,93 +11241,82 @@ JNI_METHOD(void, ColorControlCluster, moveColor)
     err = cppCluster->MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveColorTemperature)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint colorTemperatureMinimum,
- jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(moveMode), rate,
                                            colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+=======
+    err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -12447,44 +11327,37 @@ JNI_METHOD(void, ColorControlCluster, moveHue)
                               optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveSaturation)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -12495,486 +11368,418 @@ JNI_METHOD(void, ColorControlCluster, moveSaturation)
                                      optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToColor)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorX, jint colorY, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorX, jint colorY, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask,
-                                  optionsOverride);
+    err = cppCluster->MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToColorTemperature)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorTemperature, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorTemperature, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime,
-                                             optionsMask, optionsOverride);
+    err = cppCluster->MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint direction, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint direction, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, static_cast<uint8_t>(direction), transitionTime,
                                 optionsMask, optionsOverride);
+=======
+    err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToHueAndSaturation)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint saturation, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToHueAndSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask,
-                                             optionsOverride);
+    err = cppCluster->MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToSaturation)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint saturation, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask,
-                                       optionsOverride);
+    err = cppCluster->MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepColor)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepX, jint stepY, jint transitionTime, jint optionsMask,
- jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepX, jint stepY, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err =
-        cppCluster->StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepColorTemperature)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
- jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                            transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,
                                            optionsOverride);
+=======
+    err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepHue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
- jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                               optionsMask, optionsOverride);
+=======
+    err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepSaturation)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
- jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                      transitionTime, optionsMask, optionsOverride);
+=======
+    err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stopMoveStep)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stopMoveStep)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -12984,29 +11789,24 @@ JNI_METHOD(void, ColorControlCluster, stopMoveStep)
     err = cppCluster->StopMoveStep(onSuccess->Cancel(), onFailure->Cancel(), optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -13015,20 +11815,15 @@ JNI_METHOD(void, ColorControlCluster, stopMoveStep)
 JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13037,27 +11832,20 @@ JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                   static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -13067,41 +11855,31 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)
 JNI_METHOD(void, ColorControlCluster, reportCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentHue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13110,50 +11888,38 @@ JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentSaturationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(),
-                                                          static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentSaturation(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -13161,20 +11927,15 @@ JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)
 JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRemainingTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13186,20 +11947,15 @@ JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13208,27 +11964,20 @@ JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                 static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -13238,19 +11987,15 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)
 JNI_METHOD(void, ColorControlCluster, reportCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentX(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -13258,20 +12003,15 @@ JNI_METHOD(void, ColorControlCluster, reportCurrentXAttribute)(JNIEnv * env, job
 JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13280,27 +12020,20 @@ JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                 static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -13310,41 +12043,31 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)
 JNI_METHOD(void, ColorControlCluster, reportCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentY(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDriftCompensation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13356,20 +12079,16 @@ JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)
 JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCompensationText(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13381,20 +12100,15 @@ JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * en
 JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13403,50 +12117,38 @@ JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeColorTemperatureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(),
-                                                         static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeColorTemperature(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -13454,20 +12156,15 @@ JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13476,24 +12173,18 @@ JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13502,50 +12193,38 @@ JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfPrimaries(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13557,20 +12236,15 @@ JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13582,20 +12256,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13604,24 +12273,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13633,20 +12296,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13658,20 +12316,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13680,24 +12333,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13709,20 +12356,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13734,20 +12376,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13756,24 +12393,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13785,20 +12416,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13810,20 +12436,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13832,24 +12453,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13861,20 +12476,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13886,20 +12496,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13908,24 +12513,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13937,20 +12536,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13962,20 +12556,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13984,24 +12573,18 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14013,20 +12596,15 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14035,27 +12613,21 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jo
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14064,20 +12636,15 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
 JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14086,27 +12653,21 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jo
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14115,20 +12676,15 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14137,27 +12693,21 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14166,20 +12716,15 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14188,50 +12733,38 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14240,27 +12773,21 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14269,20 +12796,15 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14291,27 +12813,21 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14320,20 +12836,15 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14342,50 +12853,38 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14394,27 +12893,21 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14423,20 +12916,15 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14445,27 +12933,21 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14474,20 +12956,15 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14496,50 +12973,38 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14548,50 +13013,38 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnhancedCurrentHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14600,24 +13053,18 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnhancedColorMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14628,21 +13075,16 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)
 
 JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopActive(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14651,24 +13093,18 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopDirection(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14680,20 +13116,15 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)
 JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14702,24 +13133,18 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopStartEnhancedHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14728,24 +13153,18 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopStoredEnhancedHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14754,24 +13173,18 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorCapabilities(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14780,24 +13193,18 @@ JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTempPhysicalMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14806,24 +13213,18 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTempPhysicalMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14832,24 +13233,18 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCoupleColorTempToLevelMinMireds(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14858,24 +13253,18 @@ JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14884,28 +13273,21 @@ JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(),
-                                                                  static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err = cppCluster->WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -14914,20 +13296,15 @@ JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribut
 JNI_METHOD(void, ColorControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14944,133 +13321,105 @@ JNI_METHOD(jlong, ContentLauncherCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ContentLauncherCluster, launchContent)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean autoPlay, jstring data)
+JNI_METHOD(void, ContentLauncherCluster, launchContent)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean autoPlay, jstring data)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
-
+    
     JniUtfString dataStr(env, data);
-
-    std::unique_ptr<CHIPContentLauncherClusterLaunchContentResponseCallback,
-                    void (*)(CHIPContentLauncherClusterLaunchContentResponseCallback *)>
-        onSuccess(Platform::New<CHIPContentLauncherClusterLaunchContentResponseCallback>(callback),
-                  Platform::Delete<CHIPContentLauncherClusterLaunchContentResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPContentLauncherClusterLaunchContentResponseCallback, void (*)(CHIPContentLauncherClusterLaunchContentResponseCallback *)> onSuccess(
+        Platform::New<CHIPContentLauncherClusterLaunchContentResponseCallback>(callback), Platform::Delete<CHIPContentLauncherClusterLaunchContentResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay,
-                                    chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
+    err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ContentLauncherCluster, launchURL)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString)
+JNI_METHOD(void, ContentLauncherCluster, launchURL)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
-
+    
     JniUtfString contentURLStr(env, contentURL);
-    JniUtfString displayStringStr(env, displayString);
-
-    std::unique_ptr<CHIPContentLauncherClusterLaunchURLResponseCallback,
-                    void (*)(CHIPContentLauncherClusterLaunchURLResponseCallback *)>
-        onSuccess(Platform::New<CHIPContentLauncherClusterLaunchURLResponseCallback>(callback),
-                  Platform::Delete<CHIPContentLauncherClusterLaunchURLResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        JniUtfString displayStringStr(env, displayString);
+    
+    std::unique_ptr<CHIPContentLauncherClusterLaunchURLResponseCallback, void (*)(CHIPContentLauncherClusterLaunchURLResponseCallback *)> onSuccess(
+        Platform::New<CHIPContentLauncherClusterLaunchURLResponseCallback>(callback), Platform::Delete<CHIPContentLauncherClusterLaunchURLResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(),
-                                chip::CharSpan(contentURLStr.c_str(), strlen(contentURLStr.c_str())),
-                                chip::CharSpan(displayStringStr.c_str(), strlen(displayStringStr.c_str())));
+    err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(contentURLStr.c_str(), strlen(contentURLStr.c_str())), chip::CharSpan(displayStringStr.c_str(), strlen(displayStringStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback,
-                    void (*)(CHIPContentLauncherAcceptsHeaderListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPContentLauncherAcceptsHeaderListAttributeCallback>(callback),
-                  Platform::Delete<CHIPContentLauncherAcceptsHeaderListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback, void (*)(CHIPContentLauncherAcceptsHeaderListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPContentLauncherAcceptsHeaderListAttributeCallback>(callback), Platform::Delete<CHIPContentLauncherAcceptsHeaderListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAcceptsHeaderList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15079,26 +13428,19 @@ JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback,
-                    void (*)(CHIPContentLauncherSupportedStreamingTypesAttributeCallback *)>
-        onSuccess(Platform::New<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>(callback),
-                  Platform::Delete<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback, void (*)(CHIPContentLauncherSupportedStreamingTypesAttributeCallback *)> onSuccess(
+        Platform::New<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>(callback), Platform::Delete<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSupportedStreamingTypes(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15107,24 +13449,18 @@ JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15141,24 +13477,20 @@ JNI_METHOD(jlong, DescriptorCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, DescriptorCluster, readDeviceListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback, void (*)(CHIPDescriptorDeviceListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorDeviceListAttributeCallback>(callback),
-        Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorDeviceListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDeviceList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15171,20 +13503,15 @@ JNI_METHOD(void, DescriptorCluster, readServerListAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorServerListAttributeCallback, void (*)(CHIPDescriptorServerListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorServerListAttributeCallback>(callback),
-        Platform::Delete<CHIPDescriptorServerListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorServerListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorServerListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeServerList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15197,20 +13524,15 @@ JNI_METHOD(void, DescriptorCluster, readClientListAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorClientListAttributeCallback, void (*)(CHIPDescriptorClientListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorClientListAttributeCallback>(callback),
-        Platform::Delete<CHIPDescriptorClientListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorClientListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorClientListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClientList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15223,20 +13545,15 @@ JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobjec
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorPartsListAttributeCallback, void (*)(CHIPDescriptorPartsListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorPartsListAttributeCallback>(callback),
-        Platform::Delete<CHIPDescriptorPartsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorPartsListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorPartsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15248,20 +13565,15 @@ JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, DescriptorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15278,56 +13590,50 @@ JNI_METHOD(jlong, DiagnosticLogsCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint intent, jint requestedProtocol,
- jbyteArray transferFileDesignator)
+JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint intent, jint requestedProtocol, jbyteArray transferFileDesignator)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DiagnosticLogsCluster * cppCluster;
-
+    
     JniByteArray transferFileDesignatorArr(env, transferFileDesignator);
-
-    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback,
-                    void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)>
-        onSuccess(Platform::New<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>(callback),
-                  Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback, void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)> onSuccess(
+        Platform::New<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>(callback), Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DiagnosticLogsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->RetrieveLogsRequest(
         onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(intent), static_cast<uint8_t>(requestedProtocol),
         chip::ByteSpan((const uint8_t *) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
+=======
+    err = cppCluster->RetrieveLogsRequest(onSuccess->Cancel(), onFailure->Cancel(), intent, requestedProtocol, chip::ByteSpan((const uint8_t*) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15346,12 +13652,11 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearAllPinsResponseCallback, void (*)(CHIPDoorLockClusterClearAllPinsResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearAllPinsResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearAllPinsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearAllPinsResponseCallback, void (*)(CHIPDoorLockClusterClearAllPinsResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearAllPinsResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearAllPinsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15361,29 +13666,24 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon
     err = cppCluster->ClearAllPins(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15393,12 +13693,11 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearAllRfidsResponseCallback, void (*)(CHIPDoorLockClusterClearAllRfidsResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearAllRfidsResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearAllRfidsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearAllRfidsResponseCallback, void (*)(CHIPDoorLockClusterClearAllRfidsResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearAllRfidsResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearAllRfidsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15408,46 +13707,38 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo
     err = cppCluster->ClearAllRfids(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
+JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearHolidayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterClearHolidayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearHolidayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15457,29 +13748,24 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)
     err = cppCluster->ClearHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15489,12 +13775,11 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPDoorLockClusterClearPinResponseCallback, void (*)(CHIPDoorLockClusterClearPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearPinResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterClearPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterClearPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15504,29 +13789,24 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->ClearPin(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15536,12 +13816,11 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearRfidResponseCallback, void (*)(CHIPDoorLockClusterClearRfidResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearRfidResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearRfidResponseCallback, void (*)(CHIPDoorLockClusterClearRfidResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15551,46 +13830,38 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->ClearRfid(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15600,46 +13871,38 @@ JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)
     err = cppCluster->ClearWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterClearYeardayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterClearYeardayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearYeardayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15649,46 +13912,38 @@ JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)
     err = cppCluster->ClearYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
+JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15698,29 +13953,24 @@ JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)
     err = cppCluster->GetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15730,12 +13980,11 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterGetLogRecordResponseCallback, void (*)(CHIPDoorLockClusterGetLogRecordResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterGetLogRecordResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterGetLogRecordResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetLogRecordResponseCallback, void (*)(CHIPDoorLockClusterGetLogRecordResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterGetLogRecordResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetLogRecordResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15745,29 +13994,24 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon
     err = cppCluster->GetLogRecord(onSuccess->Cancel(), onFailure->Cancel(), logIndex);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15777,12 +14021,11 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPDoorLockClusterGetPinResponseCallback, void (*)(CHIPDoorLockClusterGetPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetPinResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterGetPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterGetPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15792,29 +14035,24 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus
     err = cppCluster->GetPin(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15824,12 +14062,11 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPDoorLockClusterGetRfidResponseCallback, void (*)(CHIPDoorLockClusterGetRfidResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetRfidResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterGetRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterGetRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15839,29 +14076,24 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->GetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -15871,12 +14103,11 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterGetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterGetUserTypeResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterGetUserTypeResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterGetUserTypeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterGetUserTypeResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterGetUserTypeResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetUserTypeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15886,46 +14117,38 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong
     err = cppCluster->GetUserType(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15935,46 +14158,38 @@ JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)
     err = cppCluster->GetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterGetYeardayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterGetYeardayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetYeardayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15984,29 +14199,24 @@ JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)
     err = cppCluster->GetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -16016,216 +14226,188 @@ JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-
+    
     JniByteArray pinArr(env, pin);
 
     std::unique_ptr<CHIPDoorLockClusterLockDoorResponseCallback, void (*)(CHIPDoorLockClusterLockDoorResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterLockDoorResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterLockDoorResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterLockDoorResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterLockDoorResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->LockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-                               chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
+    err = cppCluster->LockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jlong localStartTime, jlong localEndTime,
- jint operatingModeDuringHoliday)
+JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jlong localStartTime, jlong localEndTime, jint operatingModeDuringHoliday)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterSetHolidayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterSetHolidayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetHolidayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime,
-                                         operatingModeDuringHoliday);
+    err = cppCluster->SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setPin)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray pin)
+JNI_METHOD(void, DoorLockCluster, setPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray pin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-
+    
     JniByteArray pinArr(env, pin);
 
     std::unique_ptr<CHIPDoorLockClusterSetPinResponseCallback, void (*)(CHIPDoorLockClusterSetPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetPinResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterSetPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterSetPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                              static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
+=======
+    err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setRfid)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray id)
+JNI_METHOD(void, DoorLockCluster, setRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray id)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-
+    
     JniByteArray idArr(env, id);
 
     std::unique_ptr<CHIPDoorLockClusterSetRfidResponseCallback, void (*)(CHIPDoorLockClusterSetRfidResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetRfidResponseCallback>(callback),
-        Platform::Delete<CHIPDoorLockClusterSetRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterSetRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                               static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) idArr.data(), idArr.size()));
+=======
+    err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) idArr.data(), idArr.size()));
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setUserType)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userType)
+JNI_METHOD(void, DoorLockCluster, setUserType)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userType)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterSetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterSetUserTypeResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterSetUserTypeResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterSetUserTypeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterSetUserTypeResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterSetUserTypeResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetUserTypeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16235,131 +14417,106 @@ JNI_METHOD(void, DoorLockCluster, setUserType)
     err = cppCluster->SetUserType(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userType));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jint daysMask, jint startHour,
- jint startMinute, jint endHour, jint endMinute)
+JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jint daysMask, jint startHour, jint startMinute, jint endHour, jint endMinute)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour,
-                                         startMinute, endHour, endMinute);
+    err = cppCluster->SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
-        }
-        env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+        }
+        env->CallVoidMethod(callback, method, exception);
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jlong localStartTime,
- jlong localEndTime)
+JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jlong localStartTime, jlong localEndTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDoorLockClusterSetYeardayScheduleResponseCallback,
-                    void (*)(CHIPDoorLockClusterSetYeardayScheduleResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetYeardayScheduleResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err =
-        cppCluster->SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
+    err = cppCluster->SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -16369,99 +14526,81 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-
+    
     JniByteArray pinArr(env, pin);
 
-    std::unique_ptr<CHIPDoorLockClusterUnlockDoorResponseCallback, void (*)(CHIPDoorLockClusterUnlockDoorResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterUnlockDoorResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterUnlockDoorResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterUnlockDoorResponseCallback, void (*)(CHIPDoorLockClusterUnlockDoorResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterUnlockDoorResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterUnlockDoorResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(),
-                                 chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
+    err = cppCluster->UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint timeoutInSeconds, jbyteArray pin)
+JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint timeoutInSeconds, jbyteArray pin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-
+    
     JniByteArray pinArr(env, pin);
 
-    std::unique_ptr<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback,
-                    void (*)(CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *)>
-        onSuccess(Platform::New<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>(callback),
-                  Platform::Delete<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback, void (*)(CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *)> onSuccess(
+        Platform::New<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds,
-                                        chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
+    err = cppCluster->UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds, chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -16470,20 +14609,15 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)
 JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLockState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16492,27 +14626,20 @@ JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                  static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -16522,19 +14649,15 @@ JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)
 JNI_METHOD(void, DoorLockCluster, reportLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeLockState(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -16542,20 +14665,15 @@ JNI_METHOD(void, DoorLockCluster, reportLockStateAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLockType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16567,20 +14685,15 @@ JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActuatorEnabled(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16592,20 +14705,15 @@ JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, DoorLockCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16622,24 +14730,19 @@ JNI_METHOD(jlong, ElectricalMeasurementCluster, initWithDevice)(JNIEnv * env, jo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasurementType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16648,24 +14751,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTotalActivePower(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16674,24 +14771,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16700,24 +14791,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltageMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16726,24 +14811,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltageMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16752,24 +14831,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrent(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16778,24 +14851,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrentMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16804,24 +14871,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrentMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16830,24 +14891,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePower(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16856,24 +14911,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePowerMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16882,24 +14931,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePowerMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16908,24 +14951,18 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16947,11 +14984,10 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16961,52 +14997,41 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, j
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
-        }
-        env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+        }
+        env->CallVoidMethod(callback, method, exception);
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePHYRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17015,24 +15040,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFullDuplex(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17041,24 +15060,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17067,24 +15080,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17093,24 +15100,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17119,24 +15120,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCollisionCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17145,24 +15140,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17171,24 +15160,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCarrierDetect(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17197,24 +15180,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTimeSinceReset(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17223,24 +15200,18 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17257,24 +15228,20 @@ JNI_METHOD(jlong, FixedLabelCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback, void (*)(CHIPFixedLabelLabelListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPFixedLabelLabelListAttributeCallback>(callback),
-        Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPFixedLabelLabelListAttributeCallback>(callback), Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FixedLabelCluster * cppCluster = reinterpret_cast<FixedLabelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLabelList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17286,20 +15253,15 @@ JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, FixedLabelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FixedLabelCluster * cppCluster = reinterpret_cast<FixedLabelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17316,23 +15278,19 @@ JNI_METHOD(jlong, FlowMeasurementCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17341,24 +15299,18 @@ JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17367,24 +15319,18 @@ JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17393,6 +15339,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, FlowMeasurementCluster, readToleranceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -17420,22 +15367,20 @@ JNI_METHOD(void, FlowMeasurementCluster, readToleranceAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17452,19 +15397,16 @@ JNI_METHOD(jlong, GeneralCommissioningCluster, initWithDevice)(JNIEnv * env, job
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint expiryLengthSeconds, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint expiryLengthSeconds, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback,
-                    void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)>
-        onSuccess(Platform::New<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>(callback),
-                  Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback, void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)> onSuccess(
+        Platform::New<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17474,29 +15416,24 @@ JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)
     err = cppCluster->ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -17506,13 +15443,11 @@ JNI_METHOD(void, GeneralCommissioningCluster, commissioningComplete)(JNIEnv * en
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback,
-                    void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)>
-        onSuccess(Platform::New<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>(callback),
-                  Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback, void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)> onSuccess(
+        Platform::New<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17522,106 +15457,89 @@ JNI_METHOD(void, GeneralCommissioningCluster, commissioningComplete)(JNIEnv * en
     err = cppCluster->CommissioningComplete(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint location, jstring countryCode, jlong breadcrumb,
- jlong timeoutMs)
+JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint location, jstring countryCode, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
-
+    
     JniUtfString countryCodeStr(env, countryCode);
-
-    std::unique_ptr<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback,
-                    void (*)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *)>
-        onSuccess(Platform::New<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(callback),
-                  Platform::Delete<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback, void (*)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *)> onSuccess(
+        Platform::New<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(location),
                                           chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb,
                                           timeoutMs);
+=======
+    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17630,52 +15548,39 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback,
-                    void (*)(CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>(callback),
-                  Platform::Delete<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback, void (*)(CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>(callback), Platform::Delete<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBasicCommissioningInfoList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17684,24 +15589,18 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-{
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+{
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17718,26 +15617,20 @@ JNI_METHOD(jlong, GeneralDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback,
-                    void (*)(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *)>
-        onSuccess(Platform::New<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback),
-                  Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback, void (*)(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *)> onSuccess(
+        Platform::New<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback), Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNetworkInterfaces(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17746,24 +15639,18 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRebootCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17775,20 +15662,15 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)
 JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUpTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17797,24 +15679,18 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTotalOperationalHours(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17823,24 +15699,18 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBootReasons(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17849,24 +15719,18 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17883,24 +15747,20 @@ JNI_METHOD(jlong, GroupKeyManagementCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback, void (*)(CHIPGroupKeyManagementGroupsAttributeCallback *)>
-        onSuccess(Platform::New<CHIPGroupKeyManagementGroupsAttributeCallback>(callback),
-                  Platform::Delete<CHIPGroupKeyManagementGroupsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback, void (*)(CHIPGroupKeyManagementGroupsAttributeCallback *)> onSuccess(
+        Platform::New<CHIPGroupKeyManagementGroupsAttributeCallback>(callback), Platform::Delete<CHIPGroupKeyManagementGroupsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGroups(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17912,21 +15772,16 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, j
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback, void (*)(CHIPGroupKeyManagementGroupKeysAttributeCallback *)>
-        onSuccess(Platform::New<CHIPGroupKeyManagementGroupKeysAttributeCallback>(callback),
-                  Platform::Delete<CHIPGroupKeyManagementGroupKeysAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback, void (*)(CHIPGroupKeyManagementGroupKeysAttributeCallback *)> onSuccess(
+        Platform::New<CHIPGroupKeyManagementGroupKeysAttributeCallback>(callback), Platform::Delete<CHIPGroupKeyManagementGroupKeysAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGroupKeys(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17935,24 +15790,18 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                         = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17969,120 +15818,99 @@ JNI_METHOD(jlong, GroupsCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, GroupsCluster, addGroup)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
+JNI_METHOD(void, GroupsCluster, addGroup)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-
+    
     JniUtfString groupNameStr(env, groupName);
-
+    
     std::unique_ptr<CHIPGroupsClusterAddGroupResponseCallback, void (*)(CHIPGroupsClusterAddGroupResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterAddGroupResponseCallback>(callback),
-        Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPGroupsClusterAddGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-                               chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
+    err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
+JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-
+    
     JniUtfString groupNameStr(env, groupName);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-                                            chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
+    err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GroupsCluster, getGroupMembership)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupCount, jint groupList)
+JNI_METHOD(void, GroupsCluster, getGroupMembership)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupCount, jint groupList)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback,
-                    void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)>
-        onSuccess(Platform::New<CHIPGroupsClusterGetGroupMembershipResponseCallback>(callback),
-                  Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback, void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)> onSuccess(
+        Platform::New<CHIPGroupsClusterGetGroupMembershipResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18092,29 +15920,24 @@ JNI_METHOD(void, GroupsCluster, getGroupMembership)
     err = cppCluster->GetGroupMembership(onSuccess->Cancel(), onFailure->Cancel(), groupCount, groupList);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18124,11 +15947,10 @@ JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18138,29 +15960,24 @@ JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlo
     err = cppCluster->RemoveAllGroups(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18170,12 +15987,11 @@ JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong c
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)>
-        onSuccess(Platform::New<CHIPGroupsClusterRemoveGroupResponseCallback>(callback),
-                  Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)> onSuccess(
+        Platform::New<CHIPGroupsClusterRemoveGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18185,29 +16001,24 @@ JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->RemoveGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18217,12 +16028,11 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPGroupsClusterViewGroupResponseCallback, void (*)(CHIPGroupsClusterViewGroupResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterViewGroupResponseCallback>(callback),
-        Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPGroupsClusterViewGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18232,29 +16042,24 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->ViewGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18263,20 +16068,15 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
 JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNameSupport(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18288,20 +16088,15 @@ JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, GroupsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18323,11 +16118,10 @@ JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18337,29 +16131,24 @@ JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->Identify(onSuccess->Cancel(), onFailure->Cancel(), identifyTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18369,12 +16158,11 @@ JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPIdentifyClusterIdentifyQueryResponseCallback, void (*)(CHIPIdentifyClusterIdentifyQueryResponseCallback *)>
-        onSuccess(Platform::New<CHIPIdentifyClusterIdentifyQueryResponseCallback>(callback),
-                  Platform::Delete<CHIPIdentifyClusterIdentifyQueryResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPIdentifyClusterIdentifyQueryResponseCallback, void (*)(CHIPIdentifyClusterIdentifyQueryResponseCallback *)> onSuccess(
+        Platform::New<CHIPIdentifyClusterIdentifyQueryResponseCallback>(callback), Platform::Delete<CHIPIdentifyClusterIdentifyQueryResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18384,44 +16172,37 @@ JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlo
     err = cppCluster->IdentifyQuery(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, IdentifyCluster, triggerEffect)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectIdentifier, jint effectVariant)
+JNI_METHOD(void, IdentifyCluster, triggerEffect)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectIdentifier, jint effectVariant)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18432,29 +16213,24 @@ JNI_METHOD(void, IdentifyCluster, triggerEffect)
                                     static_cast<uint8_t>(effectVariant));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18463,20 +16239,15 @@ JNI_METHOD(void, IdentifyCluster, triggerEffect)
 JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18485,27 +16256,21 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -18514,20 +16279,15 @@ JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
 JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeIdentifyType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18539,20 +16299,15 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, IdentifyCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18786,12 +16541,11 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     KeypadInputCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)>
-        onSuccess(Platform::New<CHIPKeypadInputClusterSendKeyResponseCallback>(callback),
-                  Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)> onSuccess(
+        Platform::New<CHIPKeypadInputClusterSendKeyResponseCallback>(callback), Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18801,29 +16555,24 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
     err = cppCluster->SendKey(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(keyCode));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -18832,20 +16581,15 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
 JNI_METHOD(void, KeypadInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     KeypadInputCluster * cppCluster = reinterpret_cast<KeypadInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18862,17 +16606,15 @@ JNI_METHOD(jlong, LevelControlCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, LevelControlCluster, move)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, move)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18883,45 +16625,37 @@ JNI_METHOD(void, LevelControlCluster, move)
                            optionOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveToLevel)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime, jint optionMask,
- jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, moveToLevel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18931,44 +16665,37 @@ JNI_METHOD(void, LevelControlCluster, moveToLevel)
     err = cppCluster->MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime)
+JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18978,44 +16705,37 @@ JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)
     err = cppCluster->MoveToLevelWithOnOff(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveWithOnOff)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate)
+JNI_METHOD(void, LevelControlCluster, moveWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19025,93 +16745,82 @@ JNI_METHOD(void, LevelControlCluster, moveWithOnOff)
     err = cppCluster->MoveWithOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(moveMode), rate);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, step)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionMask,
- jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, step)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                            optionMask, optionOverride);
+=======
+    err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, stepWithOnOff)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime)
+JNI_METHOD(void, LevelControlCluster, stepWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19122,44 +16831,37 @@ JNI_METHOD(void, LevelControlCluster, stepWithOnOff)
                                     transitionTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, stop)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, stop)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19169,29 +16871,24 @@ JNI_METHOD(void, LevelControlCluster, stop)
     err = cppCluster->Stop(onSuccess->Cancel(), onFailure->Cancel(), optionMask, optionOverride);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -19201,11 +16898,10 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19215,29 +16911,24 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
     err = cppCluster->StopWithOnOff(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -19246,20 +16937,15 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
 JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19268,27 +16954,20 @@ JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                     static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -19298,19 +16977,15 @@ JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)
 JNI_METHOD(void, LevelControlCluster, reportCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentLevel(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -19318,20 +16993,15 @@ JNI_METHOD(void, LevelControlCluster, reportCurrentLevelAttribute)(JNIEnv * env,
 JNI_METHOD(void, LevelControlCluster, readRemainingTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRemainingTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19343,20 +17013,15 @@ JNI_METHOD(void, LevelControlCluster, readRemainingTimeAttribute)(JNIEnv * env,
 JNI_METHOD(void, LevelControlCluster, readMinLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19368,20 +17033,15 @@ JNI_METHOD(void, LevelControlCluster, readMinLevelAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, LevelControlCluster, readMaxLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19393,20 +17053,15 @@ JNI_METHOD(void, LevelControlCluster, readMaxLevelAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, LevelControlCluster, readCurrentFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19418,20 +17073,15 @@ JNI_METHOD(void, LevelControlCluster, readCurrentFrequencyAttribute)(JNIEnv * en
 JNI_METHOD(void, LevelControlCluster, readMinFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19443,20 +17093,15 @@ JNI_METHOD(void, LevelControlCluster, readMinFrequencyAttribute)(JNIEnv * env, j
 JNI_METHOD(void, LevelControlCluster, readMaxFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19468,20 +17113,15 @@ JNI_METHOD(void, LevelControlCluster, readMaxFrequencyAttribute)(JNIEnv * env, j
 JNI_METHOD(void, LevelControlCluster, readOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOptions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19490,50 +17130,38 @@ JNI_METHOD(void, LevelControlCluster, readOptionsAttribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOptions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19542,27 +17170,21 @@ JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19571,20 +17193,15 @@ JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
 JNI_METHOD(void, LevelControlCluster, readOnLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19593,27 +17210,21 @@ JNI_METHOD(void, LevelControlCluster, readOnLevelAttribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19622,20 +17233,15 @@ JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
 JNI_METHOD(void, LevelControlCluster, readOnTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19644,50 +17250,38 @@ JNI_METHOD(void, LevelControlCluster, readOnTransitionTimeAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19696,27 +17290,21 @@ JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19725,20 +17313,15 @@ JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
 JNI_METHOD(void, LevelControlCluster, readDefaultMoveRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDefaultMoveRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19747,50 +17330,38 @@ JNI_METHOD(void, LevelControlCluster, readDefaultMoveRateAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeDefaultMoveRate(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpCurrentLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19799,27 +17370,21 @@ JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeStartUpCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19828,20 +17393,15 @@ JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
 JNI_METHOD(void, LevelControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                   = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19863,11 +17423,10 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LowPowerCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19877,29 +17436,24 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
     err = cppCluster->Sleep(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -19908,20 +17462,15 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
 JNI_METHOD(void, LowPowerCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     LowPowerCluster * cppCluster = reinterpret_cast<LowPowerCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19943,11 +17492,10 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19957,79 +17505,65 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self,
     err = cppCluster->HideInputStatus(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaInputCluster, renameInput)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
+JNI_METHOD(void, MediaInputCluster, renameInput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-
+    
     JniUtfString nameStr(env, name);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index,
-                                  chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
+    err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20039,11 +17573,10 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20053,29 +17586,24 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo
     err = cppCluster->SelectInput(onSuccess->Cancel(), onFailure->Cancel(), index);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20085,11 +17613,10 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20099,29 +17626,24 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
     err = cppCluster->ShowInputStatus(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20130,21 +17652,16 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
 JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback, void (*)(CHIPMediaInputMediaInputListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPMediaInputMediaInputListAttributeCallback>(callback),
-                  Platform::Delete<CHIPMediaInputMediaInputListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback, void (*)(CHIPMediaInputMediaInputListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPMediaInputMediaInputListAttributeCallback>(callback), Platform::Delete<CHIPMediaInputMediaInputListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMediaInputList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20156,20 +17673,15 @@ JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, j
 JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentMediaInput(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20181,20 +17693,15 @@ JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env
 JNI_METHOD(void, MediaInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20216,13 +17723,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20232,29 +17737,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s
     err = cppCluster->MediaFastForward(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20264,13 +17764,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaNextResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaNextResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaNextResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaNextResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaNextResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaNextResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaNextResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaNextResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20280,29 +17778,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaNext(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20312,13 +17805,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPauseResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaPauseResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPauseResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaPauseResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPauseResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPauseResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaPauseResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPauseResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20328,29 +17819,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j
     err = cppCluster->MediaPause(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20360,13 +17846,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPlayResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaPlayResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPlayResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaPlayResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPlayResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPlayResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaPlayResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPlayResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20376,29 +17860,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaPlay(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20408,13 +17887,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPreviousResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaPreviousResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPreviousResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPreviousResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20424,29 +17901,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self
     err = cppCluster->MediaPrevious(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20456,13 +17928,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaRewindResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaRewindResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaRewindResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaRewindResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaRewindResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaRewindResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaRewindResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaRewindResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20472,29 +17942,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self,
     err = cppCluster->MediaRewind(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20504,13 +17969,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSeekResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaSeekResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSeekResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaSeekResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSeekResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSeekResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaSeekResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSeekResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20520,46 +17983,38 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaSeek(onSuccess->Cancel(), onFailure->Cancel(), position);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
+JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20569,46 +18024,38 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)
     err = cppCluster->MediaSkipBackward(onSuccess->Cancel(), onFailure->Cancel(), deltaPositionMilliseconds);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
+JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20618,29 +18065,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)
     err = cppCluster->MediaSkipForward(onSuccess->Cancel(), onFailure->Cancel(), deltaPositionMilliseconds);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20650,13 +18092,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaStartOverResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaStartOverResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaStartOverResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaStartOverResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20666,29 +18106,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel
     err = cppCluster->MediaStartOver(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20698,13 +18133,11 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaStopResponseCallback,
-                    void (*)(CHIPMediaPlaybackClusterMediaStopResponseCallback *)>
-        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaStopResponseCallback>(callback),
-                  Platform::Delete<CHIPMediaPlaybackClusterMediaStopResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaStopResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaStopResponseCallback *)> onSuccess(
+        Platform::New<CHIPMediaPlaybackClusterMediaStopResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaStopResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20714,29 +18147,24 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaStop(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -20745,20 +18173,15 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePlaybackState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20770,20 +18193,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env,
 JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20795,20 +18213,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, job
 JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDuration(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20817,24 +18230,18 @@ JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePositionUpdatedAt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20846,20 +18253,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)
 JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20871,20 +18273,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePlaybackSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20895,21 +18292,16 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env,
 
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSeekRangeEnd(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20921,20 +18313,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env,
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSeekRangeStart(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20946,20 +18333,15 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env
 JNI_METHOD(void, MediaPlaybackCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                    = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20976,231 +18358,184 @@ JNI_METHOD(jlong, NetworkCommissioningCluster, initWithDevice)(JNIEnv * env, job
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, addThreadNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, addThreadNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray operationalDatasetArr(env, operationalDataset);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(),
-                                       chip::ByteSpan((const uint8_t *) operationalDatasetArr.data(), operationalDatasetArr.size()),
-                                       breadcrumb, timeoutMs);
+    err = cppCluster->AddThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
- jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray ssidArr(env, ssid);
     JniByteArray credentialsArr(env, credentials);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddWiFiNetwork(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()),
-        chip::ByteSpan((const uint8_t *) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->AddWiFiNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), chip::ByteSpan((const uint8_t*) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->DisableNetwork(onSuccess->Cancel(), onFailure->Cancel(),
-                                     chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
-                                     timeoutMs);
+    err = cppCluster->DisableNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->EnableNetwork(onSuccess->Cancel(), onFailure->Cancel(),
-                                    chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
-                                    timeoutMs);
+    err = cppCluster->EnableNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21210,265 +18545,210 @@ JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
     err = cppCluster->GetLastNetworkCommissioningResult(onSuccess->Cancel(), onFailure->Cancel(), timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RemoveNetwork(onSuccess->Cancel(), onFailure->Cancel(),
-                                    chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
-                                    timeoutMs);
+    err = cppCluster->RemoveNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray ssidArr(env, ssid);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback, void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->ScanNetworks(onSuccess->Cancel(), onFailure->Cancel(),
-                                   chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->ScanNetworks(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, updateThreadNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, updateThreadNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray operationalDatasetArr(env, operationalDataset);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateThreadNetwork(
-        onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->UpdateThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
- jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-
+    
     JniByteArray ssidArr(env, ssid);
     JniByteArray credentialsArr(env, credentials);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback,
-                    void (*)(CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *)>
-        onSuccess(Platform::New<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(callback),
-                  Platform::Delete<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *)> onSuccess(
+        Platform::New<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateWiFiNetwork(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()),
-        chip::ByteSpan((const uint8_t *) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->UpdateWiFiNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), chip::ByteSpan((const uint8_t*) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21477,24 +18757,18 @@ JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                           = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21511,185 +18785,152 @@ JNI_METHOD(jlong, OtaSoftwareUpdateProviderCluster, initWithDevice)(JNIEnv * env
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong newVersion)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong newVersion)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-
+    
     JniByteArray updateTokenArr(env, updateToken);
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback,
-                    void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *)>
-        onSuccess(Platform::New<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(callback),
-                  Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback, void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *)> onSuccess(
+        Platform::New<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(callback), Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err =
-        cppCluster->ApplyUpdateRequest(onSuccess->Cancel(), onFailure->Cancel(),
-                                       chip::ByteSpan((const uint8_t *) updateTokenArr.data(), updateTokenArr.size()), newVersion);
+    err = cppCluster->ApplyUpdateRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) updateTokenArr.data(), updateTokenArr.size()), newVersion);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, notifyUpdateApplied)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong softwareVersion)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, notifyUpdateApplied)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong softwareVersion)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-
+    
     JniByteArray updateTokenArr(env, updateToken);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->NotifyUpdateApplied(onSuccess->Cancel(), onFailure->Cancel(),
-                                          chip::ByteSpan((const uint8_t *) updateTokenArr.data(), updateTokenArr.size()),
-                                          softwareVersion);
+    err = cppCluster->NotifyUpdateApplied(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) updateTokenArr.data(), updateTokenArr.size()), softwareVersion);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint vendorId, jint productId, jint hardwareVersion,
- jlong softwareVersion, jint protocolsSupported, jstring location, jboolean requestorCanConsent, jbyteArray metadataForProvider)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint vendorId, jint productId, jint hardwareVersion, jlong softwareVersion, jint protocolsSupported, jstring location, jboolean requestorCanConsent, jbyteArray metadataForProvider)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-
+    
     JniUtfString locationStr(env, location);
-    JniByteArray metadataForProviderArr(env, metadataForProvider);
+        JniByteArray metadataForProviderArr(env, metadataForProvider);
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback,
-                    void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)>
-        onSuccess(Platform::New<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(callback),
-                  Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback, void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)> onSuccess(
+        Platform::New<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(callback), Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
                                  static_cast<uint8_t>(protocolsSupported),
                                  chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent,
                                  chip::ByteSpan((const uint8_t *) metadataForProviderArr.data(), metadataForProviderArr.size()));
+=======
+    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21706,77 +18947,78 @@ JNI_METHOD(jlong, OtaSoftwareUpdateRequestorCluster, initWithDevice)(JNIEnv * en
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong providerLocation, jint vendorId, jint announcementReason,
  jbyteArray metadataForNode)
+=======
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId, jint announcementReason, jbyteArray metadataForNode)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster;
+<<<<<<< HEAD
 
+=======
+    
+    JniByteArray providerLocationArr(env, providerLocation);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     JniByteArray metadataForNodeArr(env, metadataForNode);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), providerLocation,
                                           static_cast<chip::VendorId>(vendorId), static_cast<uint8_t>(announcementReason),
                                           chip::ByteSpan((const uint8_t *) metadataForNodeArr.data(), metadataForNodeArr.size()));
+=======
+    err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) providerLocationArr.data(), providerLocationArr.size()), vendorId, announcementReason, chip::ByteSpan((const uint8_t*) metadataForNodeArr.data(), metadataForNodeArr.size()));
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21785,52 +19027,39 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel(),
-                                                       chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUpdatePossible(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21839,24 +19068,18 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21873,23 +19096,19 @@ JNI_METHOD(jlong, OccupancySensingCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21898,27 +19117,20 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                  static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -21928,41 +19140,31 @@ JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)
 JNI_METHOD(void, OccupancySensingCluster, reportOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOccupancy(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancySensorType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21971,24 +19173,18 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancySensorTypeBitmap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21997,24 +19193,18 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                       = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22036,11 +19226,10 @@ JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22050,44 +19239,37 @@ JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr
     err = cppCluster->Off(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OnOffCluster, offWithEffect)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectId, jint effectVariant)
+JNI_METHOD(void, OnOffCluster, offWithEffect)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectId, jint effectVariant)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22098,29 +19280,24 @@ JNI_METHOD(void, OnOffCluster, offWithEffect)
                                     static_cast<uint8_t>(effectVariant));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -22130,11 +19307,10 @@ JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22144,29 +19320,24 @@ JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr,
     err = cppCluster->On(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -22176,11 +19347,10 @@ JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject se
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22190,44 +19360,37 @@ JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject se
     err = cppCluster->OnWithRecallGlobalScene(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OnOffCluster, onWithTimedOff)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint onOffControl, jint onTime, jint offWaitTime)
+JNI_METHOD(void, OnOffCluster, onWithTimedOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint onOffControl, jint onTime, jint offWaitTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22237,29 +19400,24 @@ JNI_METHOD(void, OnOffCluster, onWithTimedOff)
     err = cppCluster->OnWithTimedOff(onSuccess->Cancel(), onFailure->Cancel(), onOffControl, onTime, offWaitTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -22269,11 +19427,10 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22283,29 +19440,24 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
     err = cppCluster->Toggle(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -22314,20 +19466,15 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
 JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22336,27 +19483,20 @@ JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, j
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                              static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -22366,19 +19506,15 @@ JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)
 JNI_METHOD(void, OnOffCluster, reportOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
-        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOnOff(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -22386,20 +19522,15 @@ JNI_METHOD(void, OnOffCluster, reportOnOffAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGlobalSceneControl(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22411,20 +19542,15 @@ JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22436,23 +19562,18 @@ JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22461,20 +19582,15 @@ JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOffWaitTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22483,27 +19599,21 @@ JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOffWaitTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22512,20 +19622,15 @@ JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
 JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpOnOff(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22534,27 +19639,21 @@ JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeStartUpOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22563,20 +19662,15 @@ JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
 JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22588,20 +19682,15 @@ JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, OnOffCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err            = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22618,24 +19707,19 @@ JNI_METHOD(jlong, OnOffSwitchConfigurationCluster, initWithDevice)(JNIEnv * env,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSwitchType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22644,24 +19728,18 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSwitchActions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22670,50 +19748,38 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeSwitchActions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22730,179 +19796,143 @@ JNI_METHOD(jlong, OperationalCredentialsCluster, initWithDevice)(JNIEnv * env, j
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, addNOC)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue, jbyteArray IPKValue,
- jlong caseAdminNode, jint adminVendorId)
+JNI_METHOD(void, OperationalCredentialsCluster, addNOC)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue, jbyteArray IPKValue, jlong caseAdminNode, jint adminVendorId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray NOCValueArr(env, NOCValue);
     JniByteArray ICACValueArr(env, ICACValue);
     JniByteArray IPKValueArr(env, IPKValue);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddNOC(
-        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) NOCValueArr.data(), NOCValueArr.size()),
-        chip::ByteSpan((const uint8_t *) ICACValueArr.data(), ICACValueArr.size()),
-        chip::ByteSpan((const uint8_t *) IPKValueArr.data(), IPKValueArr.size()), caseAdminNode, adminVendorId);
+    err = cppCluster->AddNOC(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) NOCValueArr.data(), NOCValueArr.size()), chip::ByteSpan((const uint8_t*) ICACValueArr.data(), ICACValueArr.size()), chip::ByteSpan((const uint8_t*) IPKValueArr.data(), IPKValueArr.size()), caseAdminNode, adminVendorId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray rootCertificate)
+JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray rootCertificate)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray rootCertificateArr(env, rootCertificate);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddTrustedRootCertificate(
-        onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) rootCertificateArr.data(), rootCertificateArr.size()));
+    err = cppCluster->AddTrustedRootCertificate(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) rootCertificateArr.data(), rootCertificateArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray attestationNonce)
+JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray attestationNonce)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray attestationNonceArr(env, attestationNonce);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterAttestationResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback, void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterAttestationResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AttestationRequest(onSuccess->Cancel(), onFailure->Cancel(),
-                                         chip::ByteSpan((const uint8_t *) attestationNonceArr.data(), attestationNonceArr.size()));
+    err = cppCluster->AttestationRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) attestationNonceArr.data(), attestationNonceArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint certificateType)
+JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint certificateType)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback, void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22912,98 +19942,80 @@ JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)
     err = cppCluster->CertificateChainRequest(onSuccess->Cancel(), onFailure->Cancel(), certificateType);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray CSRNonce)
+JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray CSRNonce)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray CSRNonceArr(env, CSRNonce);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterOpCSRResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterOpCSRResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterOpCSRResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterOpCSRResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterOpCSRResponseCallback, void (*)(CHIPOperationalCredentialsClusterOpCSRResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterOpCSRResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterOpCSRResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->OpCSRRequest(onSuccess->Cancel(), onFailure->Cancel(),
-                                   chip::ByteSpan((const uint8_t *) CSRNonceArr.data(), CSRNonceArr.size()));
+    err = cppCluster->OpCSRRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) CSRNonceArr.data(), CSRNonceArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint fabricIndex)
+JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint fabricIndex)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -23013,211 +20025,168 @@ JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)
     err = cppCluster->RemoveFabric(onSuccess->Cancel(), onFailure->Cancel(), fabricIndex);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray trustedRootIdentifier)
+JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray trustedRootIdentifier)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray trustedRootIdentifierArr(env, trustedRootIdentifier);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RemoveTrustedRootCertificate(
-        onSuccess->Cancel(), onFailure->Cancel(),
-        chip::ByteSpan((const uint8_t *) trustedRootIdentifierArr.data(), trustedRootIdentifierArr.size()));
+    err = cppCluster->RemoveTrustedRootCertificate(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) trustedRootIdentifierArr.data(), trustedRootIdentifierArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring label)
+JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring label)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniUtfString labelStr(env, label);
-
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                        chip::CharSpan(labelStr.c_str(), strlen(labelStr.c_str())));
+    err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(labelStr.c_str(), strlen(labelStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue)
+JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-
+    
     JniByteArray NOCValueArr(env, NOCValue);
     JniByteArray ICACValueArr(env, ICACValue);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
-                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateNOC(onSuccess->Cancel(), onFailure->Cancel(),
-                                chip::ByteSpan((const uint8_t *) NOCValueArr.data(), NOCValueArr.size()),
-                                chip::ByteSpan((const uint8_t *) ICACValueArr.data(), ICACValueArr.size()));
+    err = cppCluster->UpdateNOC(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) NOCValueArr.data(), NOCValueArr.size()), chip::ByteSpan((const uint8_t*) ICACValueArr.data(), ICACValueArr.size()));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback,
-                    void (*)(CHIPOperationalCredentialsFabricsListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPOperationalCredentialsFabricsListAttributeCallback>(callback),
-                  Platform::Delete<CHIPOperationalCredentialsFabricsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback, void (*)(CHIPOperationalCredentialsFabricsListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOperationalCredentialsFabricsListAttributeCallback>(callback), Platform::Delete<CHIPOperationalCredentialsFabricsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFabricsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23226,24 +20195,18 @@ JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSupportedFabrics(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23252,24 +20215,18 @@ JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCommissionedFabrics(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23278,6 +20235,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, OperationalCredentialsCluster, readTrustedRootCertificatesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -23334,22 +20292,20 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCurrentFabricIndexAttribute)
 
 JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23366,23 +20322,19 @@ JNI_METHOD(jlong, PowerSourceCluster, initWithDevice)(JNIEnv * env, jobject self
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23394,20 +20346,15 @@ JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOrder(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23419,20 +20366,16 @@ JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDescription(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23444,20 +20387,15 @@ JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, job
 JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryVoltage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23466,24 +20404,18 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryPercentRemaining(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23492,24 +20424,18 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryTimeRemaining(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23518,24 +20444,18 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryChargeLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23544,26 +20464,19 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback,
-                    void (*)(CHIPPowerSourceActiveBatteryFaultsAttributeCallback *)>
-        onSuccess(Platform::New<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback),
-                  Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback, void (*)(CHIPPowerSourceActiveBatteryFaultsAttributeCallback *)> onSuccess(
+        Platform::New<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback), Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveBatteryFaults(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23572,24 +20485,18 @@ JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryChargeState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23601,20 +20508,15 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)
 JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23626,20 +20528,15 @@ JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, PowerSourceCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23656,24 +20553,19 @@ JNI_METHOD(jlong, PressureMeasurementCluster, initWithDevice)(JNIEnv * env, jobj
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23682,72 +20574,54 @@ JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, subscribeMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PressureMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                      static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, reportMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23756,24 +20630,18 @@ JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23782,24 +20650,18 @@ JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23816,24 +20678,19 @@ JNI_METHOD(jlong, PumpConfigurationAndControlCluster, initWithDevice)(JNIEnv * e
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23842,24 +20699,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23868,24 +20719,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23894,24 +20739,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23920,24 +20759,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23946,24 +20779,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinCompPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23972,24 +20799,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxCompPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23998,24 +20819,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24024,24 +20839,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24050,24 +20859,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24076,24 +20879,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24102,24 +20899,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstTemp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24128,24 +20919,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstTemp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24154,24 +20939,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24180,72 +20959,54 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribePumpStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribePumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                   static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, reportPumpStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, reportPumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributePumpStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEffectiveOperationMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24254,24 +21015,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeA
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEffectiveControlMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24280,24 +21035,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24306,72 +21055,54 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribeCapacityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribeCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                 static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, reportCapacityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, reportCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCapacity(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24380,24 +21111,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLifetimeEnergyConsumed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24406,24 +21131,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedA
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
-    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    CHIP_ERROR err = CHIP_NO_ERROR;
+    PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24432,50 +21151,38 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOperationMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeControlMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24484,50 +21191,38 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeControlMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAlarmMask(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24536,24 +21231,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24562,24 +21251,18 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24596,24 +21279,19 @@ JNI_METHOD(jlong, RelativeHumidityMeasurementCluster, initWithDevice)(JNIEnv * e
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24622,72 +21300,54 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, subscribeMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                      static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24696,24 +21356,18 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24722,6 +21376,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribu
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -24798,22 +21453,20 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportToleranceAttribute)
 
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24830,54 +21483,44 @@ JNI_METHOD(jlong, ScenesCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ScenesCluster, addScene)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName,
- jlong clusterId, jint length, jint value)
+JNI_METHOD(void, ScenesCluster, addScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName, jlong clusterId, jint length, jint value)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-
+    
     JniUtfString sceneNameStr(env, sceneName);
-
+    
     std::unique_ptr<CHIPScenesClusterAddSceneResponseCallback, void (*)(CHIPScenesClusterAddSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterAddSceneResponseCallback>(callback),
-        Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterAddSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime,
-                               chip::CharSpan(sceneNameStr.c_str(), strlen(sceneNameStr.c_str())), clusterId, length, value);
+    err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime, chip::CharSpan(sceneNameStr.c_str(), strlen(sceneNameStr.c_str())), clusterId, length, value);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -24887,13 +21530,11 @@ JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback,
-                    void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)>
-        onSuccess(Platform::New<CHIPScenesClusterGetSceneMembershipResponseCallback>(callback),
-                  Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback, void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)> onSuccess(
+        Platform::New<CHIPScenesClusterGetSceneMembershipResponseCallback>(callback), Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24903,44 +21544,37 @@ JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self,
     err = cppCluster->GetSceneMembership(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, recallScene)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime)
+JNI_METHOD(void, ScenesCluster, recallScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24950,29 +21584,24 @@ JNI_METHOD(void, ScenesCluster, recallScene)
     err = cppCluster->RecallScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -24982,12 +21611,11 @@ JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)>
-        onSuccess(Platform::New<CHIPScenesClusterRemoveAllScenesResponseCallback>(callback),
-                  Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)> onSuccess(
+        Platform::New<CHIPScenesClusterRemoveAllScenesResponseCallback>(callback), Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24997,45 +21625,38 @@ JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlo
     err = cppCluster->RemoveAllScenes(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, removeScene)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, removeScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)>
-        onSuccess(Platform::New<CHIPScenesClusterRemoveSceneResponseCallback>(callback),
-                  Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)> onSuccess(
+        Platform::New<CHIPScenesClusterRemoveSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25045,45 +21666,38 @@ JNI_METHOD(void, ScenesCluster, removeScene)
     err = cppCluster->RemoveScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, storeScene)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, storeScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPScenesClusterStoreSceneResponseCallback, void (*)(CHIPScenesClusterStoreSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterStoreSceneResponseCallback>(callback),
-        Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterStoreSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25093,45 +21707,38 @@ JNI_METHOD(void, ScenesCluster, storeScene)
     err = cppCluster->StoreScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, viewScene)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, viewScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
+    
 
     std::unique_ptr<CHIPScenesClusterViewSceneResponseCallback, void (*)(CHIPScenesClusterViewSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterViewSceneResponseCallback>(callback),
-        Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterViewSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25141,29 +21748,24 @@ JNI_METHOD(void, ScenesCluster, viewScene)
     err = cppCluster->ViewScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -25172,20 +21774,15 @@ JNI_METHOD(void, ScenesCluster, viewScene)
 JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSceneCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25197,20 +21794,15 @@ JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentScene(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25222,20 +21814,15 @@ JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentGroup(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25247,20 +21834,15 @@ JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSceneValid(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25272,20 +21854,15 @@ JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNameSupport(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25297,20 +21874,15 @@ JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25332,11 +21904,10 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobj
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25346,52 +21917,41 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobj
     err = cppCluster->ResetWatermarks(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapFree(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25400,24 +21960,18 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapUsed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25426,24 +21980,18 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapHighWatermark(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25452,24 +22000,18 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                          = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25486,23 +22028,19 @@ JNI_METHOD(jlong, SwitchCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfPositions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25514,20 +22052,15 @@ JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25536,27 +22069,20 @@ JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel(),
-                                                        static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -25566,19 +22092,15 @@ JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)
 JNI_METHOD(void, SwitchCluster, reportCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPosition(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -25586,20 +22108,15 @@ JNI_METHOD(void, SwitchCluster, reportCurrentPositionAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, SwitchCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25621,63 +22138,52 @@ JNI_METHOD(void, TvChannelCluster, changeChannel)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
-
+    
     JniUtfString matchStr(env, match);
-
-    std::unique_ptr<CHIPTvChannelClusterChangeChannelResponseCallback,
-                    void (*)(CHIPTvChannelClusterChangeChannelResponseCallback *)>
-        onSuccess(Platform::New<CHIPTvChannelClusterChangeChannelResponseCallback>(callback),
-                  Platform::Delete<CHIPTvChannelClusterChangeChannelResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPTvChannelClusterChangeChannelResponseCallback, void (*)(CHIPTvChannelClusterChangeChannelResponseCallback *)> onSuccess(
+        Platform::New<CHIPTvChannelClusterChangeChannelResponseCallback>(callback), Platform::Delete<CHIPTvChannelClusterChangeChannelResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(),
-                                    chip::CharSpan(matchStr.c_str(), strlen(matchStr.c_str())));
+    err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(matchStr.c_str(), strlen(matchStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint majorNumber, jint minorNumber)
+JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint majorNumber, jint minorNumber)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25687,29 +22193,24 @@ JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)
     err = cppCluster->ChangeChannelByNumber(onSuccess->Cancel(), onFailure->Cancel(), majorNumber, minorNumber);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -25719,11 +22220,10 @@ JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25733,29 +22233,24 @@ JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlon
     err = cppCluster->SkipChannel(onSuccess->Cancel(), onFailure->Cancel(), count);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -25765,20 +22260,15 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, job
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback, void (*)(CHIPTvChannelTvChannelListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTvChannelTvChannelListAttributeCallback>(callback),
-        Platform::Delete<CHIPTvChannelTvChannelListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPTvChannelTvChannelListAttributeCallback>(callback), Platform::Delete<CHIPTvChannelTvChannelListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTvChannelList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25790,20 +22280,16 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, job
 JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTvChannelLineup(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25815,20 +22301,16 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, j
 JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentTvChannel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25840,20 +22322,15 @@ JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env,
 JNI_METHOD(void, TvChannelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25870,79 +22347,62 @@ JNI_METHOD(jlong, TargetNavigatorCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint target, jstring data)
+JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint target, jstring data)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster;
-
+    
     JniUtfString dataStr(env, data);
-
-    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback,
-                    void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)>
-        onSuccess(Platform::New<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>(callback),
-                  Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback, void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)> onSuccess(
+        Platform::New<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>(callback), Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target,
-                                     chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
+    err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
-        err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback,
-                    void (*)(CHIPTargetNavigatorTargetNavigatorListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>(callback),
-                  Platform::Delete<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback, void (*)(CHIPTargetNavigatorTargetNavigatorListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>(callback), Platform::Delete<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetNavigatorList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25951,24 +22411,18 @@ JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                      = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25985,24 +22439,19 @@ JNI_METHOD(jlong, TemperatureMeasurementCluster, initWithDevice)(JNIEnv * env, j
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26011,72 +22460,54 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, subscribeMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, TemperatureMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                      static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, reportMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26085,24 +22516,18 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26111,6 +22536,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, TemperatureMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -26187,22 +22613,20 @@ JNI_METHOD(void, TemperatureMeasurementCluster, reportToleranceAttribute)
 
 JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26224,11 +22648,10 @@ JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26238,46 +22661,38 @@ JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->Test(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testAddArguments)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
+JNI_METHOD(void, TestClusterCluster, testAddArguments)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)>
-        onSuccess(Platform::New<CHIPTestClusterClusterTestAddArgumentsResponseCallback>(callback),
-                  Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback, void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)> onSuccess(
+        Platform::New<CHIPTestClusterClusterTestAddArgumentsResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26287,33 +22702,29 @@ JNI_METHOD(void, TestClusterCluster, testAddArguments)
     err = cppCluster->TestAddArguments(onSuccess->Cancel(), onFailure->Cancel(), arg1, arg2);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
+<<<<<<< HEAD
 JNI_METHOD(void, TestClusterCluster, testEnumsRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
@@ -26365,15 +22776,17 @@ JNI_METHOD(void, TestClusterCluster, testEnumsRequest)
 }
 JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
+=======
+JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26383,46 +22796,38 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
     err = cppCluster->TestListInt8UArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), arg1);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
+JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)>
-        onSuccess(Platform::New<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>(callback),
-                  Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback, void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)> onSuccess(
+        Platform::New<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26432,81 +22837,72 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)
     err = cppCluster->TestListInt8UReverseRequest(onSuccess->Cancel(), onFailure->Cancel(), arg1);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
+JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-
+    
     JniByteArray dArr(env, d);
     JniUtfString eStr(env, e);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                     chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
                                                     chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+=======
+    err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -26516,11 +22912,10 @@ JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26530,29 +22925,24 @@ JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self,
     err = cppCluster->TestNotHandled(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -26611,13 +23001,11 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback,
-                    void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)>
-        onSuccess(Platform::New<CHIPTestClusterClusterTestSpecificResponseCallback>(callback),
-                  Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback, void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)> onSuccess(
+        Platform::New<CHIPTestClusterClusterTestSpecificResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26627,81 +23015,72 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
     err = cppCluster->TestSpecific(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
+JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-
+    
     JniByteArray dArr(env, d);
     JniUtfString eStr(env, e);
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                 chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
                                                 chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+=======
+    err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -26711,11 +23090,10 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26725,29 +23103,24 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
     err = cppCluster->TestUnknownCommand(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -26756,20 +23129,15 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
 JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBoolean(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26778,49 +23146,38 @@ JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBoolean(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
 JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-{
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+{
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap8(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26829,27 +23186,21 @@ JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap8(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -26858,20 +23209,15 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
 JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap16(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26880,27 +23226,21 @@ JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap16(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -26909,20 +23249,15 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
 JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap32(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26931,27 +23266,21 @@ JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap32(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -26960,20 +23289,15 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
 JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap64(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26982,27 +23306,21 @@ JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap64(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27011,20 +23329,15 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
 JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt8u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27033,27 +23346,21 @@ JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt8u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27062,20 +23369,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt16u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27084,27 +23386,21 @@ JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt16u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27113,20 +23409,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt32u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27135,27 +23426,21 @@ JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt32u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27164,20 +23449,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt64u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27186,27 +23466,21 @@ JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt64u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27215,20 +23489,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt8s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27237,27 +23506,21 @@ JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt8s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27266,20 +23529,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt16s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27288,27 +23546,21 @@ JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt16s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27317,20 +23569,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt32s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27339,27 +23586,21 @@ JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt32s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int32_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27368,20 +23609,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
 JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64sAttributeCallback, void (*)(CHIPInt64sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64sAttributeCallback>(callback), Platform::Delete<CHIPInt64sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64sAttributeCallback, void (*)(CHIPInt64sAttributeCallback *)> onSuccess(Platform::New<CHIPInt64sAttributeCallback>(callback), Platform::Delete<CHIPInt64sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt64s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27390,27 +23626,21 @@ JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt64s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int64_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27419,20 +23649,15 @@ JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
 JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnum8(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27441,27 +23666,21 @@ JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEnum8(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27470,20 +23689,15 @@ JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
 JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnum16(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27492,27 +23706,21 @@ JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEnum16(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27521,20 +23729,16 @@ JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
 JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27543,28 +23747,21 @@ JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel(),
-                                                chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -27575,20 +23772,15 @@ JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback, void (*)(CHIPTestClusterListInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterListInt8uAttributeCallback>(callback),
-        Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPTestClusterListInt8uAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListInt8u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27600,21 +23792,16 @@ JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, void (*)(CHIPTestClusterListOctetStringAttributeCallback *)>
-        onSuccess(Platform::New<CHIPTestClusterListOctetStringAttributeCallback>(callback),
-                  Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, void (*)(CHIPTestClusterListOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPTestClusterListOctetStringAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27623,26 +23810,19 @@ JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback,
-                    void (*)(CHIPTestClusterListStructOctetStringAttributeCallback *)>
-        onSuccess(Platform::New<CHIPTestClusterListStructOctetStringAttributeCallback>(callback),
-                  Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback, void (*)(CHIPTestClusterListStructOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPTestClusterListStructOctetStringAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListStructOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27654,20 +23834,16 @@ JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)
 JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27676,28 +23852,21 @@ JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel(),
-                                                    chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -27707,20 +23876,16 @@ JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
 JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCharString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27729,28 +23894,21 @@ JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-    err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(),
-                                               chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+    err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -27760,20 +23918,16 @@ JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
 JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27782,28 +23936,21 @@ JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-    err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(),
-                                                   chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+    err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -27813,20 +23960,15 @@ JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
 JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEpochUs(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27835,27 +23977,21 @@ JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEpochUs(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27864,20 +24000,15 @@ JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
 JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEpochS(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27886,27 +24017,21 @@ JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEpochS(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27966,20 +24091,15 @@ JNI_METHOD(void, TestClusterCluster, writeVendorIdAttribute)
 JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUnsupported(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27988,27 +24108,21 @@ JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeUnsupported(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -28017,20 +24131,15 @@ JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
 JNI_METHOD(void, TestClusterCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                  = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28052,11 +24161,10 @@ JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28066,29 +24174,24 @@ JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject s
     err = cppCluster->ClearWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -28098,11 +24201,10 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28112,44 +24214,37 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel
     err = cppCluster->GetRelayStatusLog(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint daysToReturn, jint modeToReturn)
+JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint daysToReturn, jint modeToReturn)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28159,93 +24254,77 @@ JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)
     err = cppCluster->GetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), daysToReturn, modeToReturn);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint numberOfTransitionsForSequence, jint dayOfWeekForSequence,
- jint modeForSequence, jint payload)
+JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint numberOfTransitionsForSequence, jint dayOfWeekForSequence, jint modeForSequence, jint payload)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), numberOfTransitionsForSequence,
-                                        dayOfWeekForSequence, modeForSequence, payload);
+    err = cppCluster->SetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, payload);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint mode, jint amount)
+JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint mode, jint amount)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28255,29 +24334,24 @@ JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
     err = cppCluster->SetpointRaiseLower(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(mode), amount);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -28286,20 +24360,15 @@ JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
 JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28308,27 +24377,20 @@ JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel(),
-                                                         static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -28338,41 +24400,31 @@ JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)
 JNI_METHOD(void, ThermostatCluster, reportLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeLocalTemperature(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28381,24 +24433,18 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28407,24 +24453,18 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28433,24 +24473,18 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28459,24 +24493,18 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupiedCoolingSetpoint(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28485,50 +24513,38 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOccupiedCoolingSetpoint(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupiedHeatingSetpoint(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28537,50 +24553,38 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOccupiedHeatingSetpoint(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28589,50 +24593,38 @@ JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28641,50 +24633,38 @@ JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28693,50 +24673,38 @@ JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28745,32 +24713,27 @@ JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, ThermostatCluster, readMinSetpointDeadBandAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -28825,22 +24788,20 @@ JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
 
 JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28849,28 +24810,21 @@ JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err =
-        cppCluster->WriteAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err = cppCluster->WriteAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -28879,20 +24833,15 @@ JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
 JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSystemMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28901,27 +24850,21 @@ JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeSystemMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -28930,20 +24873,15 @@ JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
 JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartOfWeek(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28952,24 +24890,18 @@ JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfWeeklyTransitions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -28978,24 +24910,18 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfDailyTransitions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29007,20 +24933,15 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)
 JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29032,20 +24953,15 @@ JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                 = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29053,8 +24969,7 @@ JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env,
     onSuccess.release();
     onFailure.release();
 }
-JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)
-(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
+JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
     chip::DeviceLayer::StackLock lock;
     ThermostatUserInterfaceConfigurationCluster * cppCluster = new ThermostatUserInterfaceConfigurationCluster();
@@ -29063,25 +24978,19 @@ JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDisplayModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDisplayModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTemperatureDisplayMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29090,52 +24999,38 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDis
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeTemperatureDisplayMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeKeypadLockout(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29144,52 +25039,38 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutA
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeKeypadLockout(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgrammingVisibilityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgrammingVisibilityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29198,53 +25079,38 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgra
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
-{
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+{
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->WriteAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel(),
-                                                                  static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err = cppCluster->WriteAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster =
-        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29266,11 +25132,10 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, job
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -29280,52 +25145,41 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, job
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29334,24 +25188,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRoutingRole(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29360,24 +25208,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNetworkName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29386,24 +25229,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePanId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29412,24 +25249,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeExtendedPanId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29438,24 +25269,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeshLocalPrefix(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29464,24 +25290,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29490,26 +25310,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback,
-                    void (*)(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback),
-                  Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNeighborTableList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29518,26 +25331,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback,
-                    void (*)(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback),
-                  Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRouteTableList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29546,24 +25352,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartitionId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29572,24 +25372,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWeighting(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29598,24 +25392,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDataVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29624,24 +25412,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStableDataVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29650,24 +25432,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLeaderRouterId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29676,24 +25452,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDetachedRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29702,24 +25472,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChildRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29728,24 +25492,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRouterRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29754,24 +25512,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLeaderRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29780,24 +25532,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAttachAttemptCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29806,24 +25552,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartitionIdChangeCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29832,24 +25572,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttemptCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttemptCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBetterPartitionAttachAttemptCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29858,24 +25592,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttem
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeParentChangeCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29884,24 +25612,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxTotalCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29910,24 +25632,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxUnicastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29936,24 +25652,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBroadcastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29962,24 +25672,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxAckRequestedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -29988,24 +25692,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxAckedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30014,24 +25712,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxNoAckRequestedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30040,24 +25732,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDataCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30066,24 +25752,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDataPollCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30092,24 +25772,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBeaconCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30118,24 +25792,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBeaconRequestCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30144,24 +25812,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30170,24 +25832,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxRetryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30196,24 +25852,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDirectMaxRetryExpiryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30222,24 +25872,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCoun
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxIndirectMaxRetryExpiryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30248,24 +25892,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCo
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrCcaCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30274,24 +25912,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrAbortCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30300,24 +25932,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrBusyChannelCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30326,24 +25952,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxTotalCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30352,24 +25972,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxUnicastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30378,24 +25992,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBroadcastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30404,24 +26012,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDataCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30430,24 +26032,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDataPollCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30456,24 +26052,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBeaconCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30482,24 +26072,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBeaconRequestCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30508,24 +26092,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30534,24 +26112,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxAddressFilteredCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30560,24 +26132,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDestAddrFilteredCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30586,24 +26152,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDuplicatedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30612,24 +26172,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrNoFrameCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30638,24 +26192,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrUnknownNeighborCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30664,24 +26212,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountA
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrInvalidSrcAddrCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30690,24 +26232,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrSecCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30716,24 +26252,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrFcsCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30742,24 +26272,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30768,24 +26292,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveTimestamp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30794,24 +26312,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePendingTimestamp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30820,24 +26332,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDelay(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30846,26 +26352,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback,
-                    void (*)(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *)>
-        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>(callback),
-                  Platform::Delete<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *)> onSuccess(
+        Platform::New<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSecurityPolicy(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30874,24 +26373,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannelMask(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30900,26 +26394,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponentsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponentsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback,
-                    void (*)(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *)>
-        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>(callback),
-                  Platform::Delete<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *)> onSuccess(
+        Platform::New<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationalDatasetComponents(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30928,26 +26415,19 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponen
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback,
-                    void (*)(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *)>
-        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback),
-                  Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *)> onSuccess(
+        Platform::New<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveNetworkFaultsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30956,24 +26436,18 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                               = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -30990,23 +26464,20 @@ JNI_METHOD(jlong, WakeOnLanCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+
 JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
+        false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WakeOnLanCluster * cppCluster = reinterpret_cast<WakeOnLanCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWakeOnLanMacAddress(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31018,20 +26489,15 @@ JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * en
 JNI_METHOD(void, WakeOnLanCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WakeOnLanCluster * cppCluster = reinterpret_cast<WakeOnLanCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31053,11 +26519,10 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31067,29 +26532,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -31098,20 +26558,16 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
+        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBssid(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31120,24 +26576,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSecurityType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31146,24 +26596,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWiFiVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31172,24 +26616,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannelNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31201,20 +26639,15 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRssi(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31223,24 +26656,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBeaconLostCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31249,24 +26676,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBeaconRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31275,24 +26696,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketMulticastRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31301,24 +26716,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketMulticastTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31327,24 +26736,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketUnicastRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31353,24 +26756,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketUnicastTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31379,24 +26776,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentMaxRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31405,24 +26796,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31431,24 +26816,18 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                             = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31470,11 +26849,10 @@ JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31484,44 +26862,37 @@ JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self,
     err = cppCluster->DownOrClose(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftPercentageValue, jint liftPercent100thsValue)
+JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftPercentageValue, jint liftPercent100thsValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31531,44 +26902,37 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)
     err = cppCluster->GoToLiftPercentage(onSuccess->Cancel(), onFailure->Cancel(), liftPercentageValue, liftPercent100thsValue);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftValue)
+JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31577,45 +26941,38 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)
 
     err = cppCluster->GoToLiftValue(onSuccess->Cancel(), onFailure->Cancel(), liftValue);
     SuccessOrExit(err);
-
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltPercentageValue, jint tiltPercent100thsValue)
+JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltPercentageValue, jint tiltPercent100thsValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31625,44 +26982,37 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)
     err = cppCluster->GoToTiltPercentage(onSuccess->Cancel(), onFailure->Cancel(), tiltPercentageValue, tiltPercent100thsValue);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltValue)
+JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31672,29 +27022,24 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)
     err = cppCluster->GoToTiltValue(onSuccess->Cancel(), onFailure->Cancel(), tiltValue);
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -31704,11 +27049,10 @@ JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31718,29 +27062,24 @@ JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self,
     err = cppCluster->StopMotion(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -31750,11 +27089,10 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
+    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -31764,29 +27102,24 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
     err = cppCluster->UpOrOpen(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit:
-    if (err != CHIP_NO_ERROR)
-    {
+exit: 
+    if (err != CHIP_NO_ERROR) {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR)
-        {
+        if (err != CHIP_NO_ERROR) {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    }
-    else
-    {
+    } else {
         onSuccess.release();
         onFailure.release();
     }
@@ -31795,20 +27128,15 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31817,24 +27145,18 @@ JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31843,24 +27165,18 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31872,20 +27188,15 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeConfigStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31894,24 +27205,18 @@ JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLiftPercentage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31920,72 +27225,54 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercentage(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercentage(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionLiftPercentage(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTiltPercentage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -31994,72 +27281,54 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercentage(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercentage(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercentageAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionTiltPercentage(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32068,72 +27337,54 @@ JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeOperationalStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel(),
-                                                          static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportOperationalStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOperationalStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32142,72 +27393,54 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeTargetPositionLiftPercent100ths(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeTargetPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeTargetPositionLiftPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32216,50 +27449,38 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeTargetPositionTiltPercent100ths(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeTargetPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeTargetPositionTiltPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -32267,20 +27488,15 @@ JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAtt
 JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEndProductType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32289,24 +27505,18 @@ JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32315,72 +27525,54 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercent100ths(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionLiftPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32389,72 +27581,54 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercent100ths(
-        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercent100thsAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionTiltPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledOpenLimitLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32463,24 +27637,18 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledClosedLimitLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32489,24 +27657,18 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledOpenLimitTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32515,24 +27677,18 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledClosedLimitTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32544,20 +27700,15 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32566,27 +27717,21 @@ JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -32595,20 +27740,15 @@ JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
 JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -32617,27 +27757,20 @@ JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
-                                                     static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -32647,23 +27780,20 @@ JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)
 JNI_METHOD(void, WindowCoveringCluster, reportSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
-        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+    
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeSafetyStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR,
-                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, WindowCoveringCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -32691,22 +27821,20 @@ JNI_METHOD(void, WindowCoveringCluster, readFeatureMapAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
-        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr,
-                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err                     = CHIP_NO_ERROR;
+    CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr,
-                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 510745f0313773..df08d156b491a8 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -25,43 +25,37 @@ public class ChipClusters {
 
   public interface DefaultClusterCallback {
     void onSuccess();
-
     void onError(Exception error);
   }
 
   public interface CharStringAttributeCallback {
     /** Indicates a successful read for a CHAR_STRING attribute. */
     void onSuccess(String value);
-
     void onError(Exception error);
   }
 
   public interface OctetStringAttributeCallback {
     /** Indicates a successful read for an OCTET_STRING attribute. */
     void onSuccess(byte[] value);
-
     void onError(Exception error);
   }
 
   public interface IntegerAttributeCallback {
     void onSuccess(int value);
-
     void onError(Exception error);
   }
 
   public interface LongAttributeCallback {
     void onSuccess(long value);
-
     void onError(Exception error);
   }
 
   public interface BooleanAttributeCallback {
     void onSuccess(boolean value);
-
     void onError(Exception error);
   }
 
-  public abstract static class BaseChipCluster {
+  public static abstract class BaseChipCluster {
     protected long chipClusterPtr;
 
     public BaseChipCluster(long devicePtr, int endpointId) {
@@ -71,7 +65,7 @@ public BaseChipCluster(long devicePtr, int endpointId) {
     public abstract long initWithDevice(long devicePtr, int endpointId);
 
     public native void deleteCluster(long chipClusterPtr);
-
+    
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
       super.finalize();
@@ -99,32 +93,32 @@ public void getSetupPIN(GetSetupPINResponseCallback callback, String tempAccount
       getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier);
     }
 
-    public void login(
-        DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN) {
+
+    public void login(DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN) {
       login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN);
     }
 
-    private native void getSetupPIN(
-        long chipClusterPtr, GetSetupPINResponseCallback callback, String tempAccountIdentifier);
-
-    private native void login(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        String tempAccountIdentifier,
-        String setupPIN);
-
+    private native void getSetupPIN(long chipClusterPtr, GetSetupPINResponseCallback callback, String tempAccountIdentifier);
+    private native void login(long chipClusterPtr, DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN);
     public interface GetSetupPINResponseCallback {
-      void onSuccess(String setupPIN);
-
+      void onSuccess(
+      String setupPIN
+      );
+      
       void onError(Exception error);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class AdministratorCommissioningCluster extends BaseChipCluster {
@@ -139,55 +133,34 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void openBasicCommissioningWindow(
-        DefaultClusterCallback callback, int commissioningTimeout) {
+    public void openBasicCommissioningWindow(DefaultClusterCallback callback, int commissioningTimeout) {
       openBasicCommissioningWindow(chipClusterPtr, callback, commissioningTimeout);
     }
 
-    public void openCommissioningWindow(
-        DefaultClusterCallback callback,
-        int commissioningTimeout,
-        byte[] PAKEVerifier,
-        int discriminator,
-        long iterations,
-        byte[] salt,
-        int passcodeID) {
-      openCommissioningWindow(
-          chipClusterPtr,
-          callback,
-          commissioningTimeout,
-          PAKEVerifier,
-          discriminator,
-          iterations,
-          salt,
-          passcodeID);
+
+    public void openCommissioningWindow(DefaultClusterCallback callback, int commissioningTimeout, byte[] PAKEVerifier, int discriminator, long iterations, byte[] salt, int passcodeID) {
+      openCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, PAKEVerifier, discriminator, iterations, salt, passcodeID);
     }
 
+
     public void revokeCommissioning(DefaultClusterCallback callback) {
       revokeCommissioning(chipClusterPtr, callback);
     }
 
-    private native void openBasicCommissioningWindow(
-        long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout);
-
-    private native void openCommissioningWindow(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int commissioningTimeout,
-        byte[] PAKEVerifier,
-        int discriminator,
-        long iterations,
-        byte[] salt,
-        int passcodeID);
-
+    private native void openBasicCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout);
+    private native void openCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout, byte[] PAKEVerifier, int discriminator, long iterations, byte[] salt, int passcodeID);
     private native void revokeCommissioning(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class ApplicationBasicCluster extends BaseChipCluster {
@@ -206,64 +179,88 @@ public void changeStatus(DefaultClusterCallback callback, int status) {
       changeStatus(chipClusterPtr, callback, status);
     }
 
-    private native void changeStatus(
-        long chipClusterPtr, DefaultClusterCallback callback, int status);
+    private native void changeStatus(long chipClusterPtr, DefaultClusterCallback callback, int status);
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIdAttribute(IntegerAttributeCallback callback) {
+    public void readVendorIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationNameAttribute(CharStringAttributeCallback callback) {
+    public void readApplicationNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readApplicationNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductIdAttribute(IntegerAttributeCallback callback) {
+    public void readProductIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readProductIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationIdAttribute(CharStringAttributeCallback callback) {
+    public void readApplicationIdAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readApplicationIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readCatalogVendorIdAttribute(IntegerAttributeCallback callback) {
+    public void readCatalogVendorIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCatalogVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationStatusAttribute(IntegerAttributeCallback callback) {
+    public void readApplicationStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readApplicationStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readVendorIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readApplicationNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readApplicationIdAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readCatalogVendorIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readApplicationStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readVendorNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readVendorIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readApplicationNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readApplicationIdAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readCatalogVendorIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readApplicationStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class ApplicationLauncherCluster extends BaseChipCluster {
@@ -278,61 +275,68 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void launchApp(
-        LaunchAppResponseCallback callback,
-        String data,
-        int catalogVendorId,
-        String applicationId) {
+    public void launchApp(LaunchAppResponseCallback callback, String data, int catalogVendorId, String applicationId) {
       launchApp(chipClusterPtr, callback, data, catalogVendorId, applicationId);
     }
 
-    private native void launchApp(
-        long chipClusterPtr,
-        LaunchAppResponseCallback callback,
-        String data,
-        int catalogVendorId,
-        String applicationId);
-
+    private native void launchApp(long chipClusterPtr, LaunchAppResponseCallback callback, String data, int catalogVendorId, String applicationId);
     public interface LaunchAppResponseCallback {
-      void onSuccess(int status, String data);
-
+      void onSuccess(
+      int status
+      , String data
+      );
+      
       void onError(Exception error);
     }
 
-    public interface ApplicationLauncherListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
 
+
+    public interface ApplicationLauncherListAttributeCallback {
+      void onSuccess(List<
+        Integer
+              > valueList);
       void onError(Exception ex);
     }
 
     public void readApplicationLauncherListAttribute(
-        ApplicationLauncherListAttributeCallback callback) {
+      ApplicationLauncherListAttributeCallback callback
+    ) {
       readApplicationLauncherListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCatalogVendorIdAttribute(IntegerAttributeCallback callback) {
+    public void readCatalogVendorIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCatalogVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationIdAttribute(IntegerAttributeCallback callback) {
+    public void readApplicationIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readApplicationIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readApplicationLauncherListAttribute(
-        long chipClusterPtr, ApplicationLauncherListAttributeCallback callback);
-
-    private native void readCatalogVendorIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readApplicationIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readApplicationLauncherListAttribute(long chipClusterPtr,
+      ApplicationLauncherListAttributeCallback callback
+    );
+  
+    private native void readCatalogVendorIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readApplicationIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class AudioOutputCluster extends BaseChipCluster {
@@ -351,22 +355,24 @@ public void renameOutput(DefaultClusterCallback callback, int index, String name
       renameOutput(chipClusterPtr, callback, index, name);
     }
 
+
     public void selectOutput(DefaultClusterCallback callback, int index) {
       selectOutput(chipClusterPtr, callback, index);
     }
 
-    private native void renameOutput(
-        long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
-
-    private native void selectOutput(
-        long chipClusterPtr, DefaultClusterCallback callback, int index);
+    private native void renameOutput(long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
+    private native void selectOutput(long chipClusterPtr, DefaultClusterCallback callback, int index);
 
     public static class AudioOutputListAttribute {
       public int index;
-      public int outputType;
-      public String name;
-
-      public AudioOutputListAttribute(int index, int outputType, String name) {
+            public int outputType;
+            public String name;
+
+      public AudioOutputListAttribute(
+        int index,
+                int outputType,
+                String name
+      ) {
         this.index = index;
         this.outputType = outputType;
         this.name = name;
@@ -374,31 +380,41 @@ public AudioOutputListAttribute(int index, int outputType, String name) {
     }
 
     public interface AudioOutputListAttributeCallback {
-      void onSuccess(List<AudioOutputListAttribute> valueList);
-
+      void onSuccess(List<
+      AudioOutputListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readAudioOutputListAttribute(AudioOutputListAttributeCallback callback) {
+    public void readAudioOutputListAttribute(
+      AudioOutputListAttributeCallback callback
+    ) {
       readAudioOutputListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentAudioOutputAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentAudioOutputAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentAudioOutputAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readAudioOutputListAttribute(
-        long chipClusterPtr, AudioOutputListAttributeCallback callback);
-
-    private native void readCurrentAudioOutputAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readAudioOutputListAttribute(long chipClusterPtr,
+      AudioOutputListAttributeCallback callback
+    );
+  
+    private native void readCurrentAudioOutputAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BarrierControlCluster extends BaseChipCluster {
@@ -417,49 +433,64 @@ public void barrierControlGoToPercent(DefaultClusterCallback callback, int perce
       barrierControlGoToPercent(chipClusterPtr, callback, percentOpen);
     }
 
+
     public void barrierControlStop(DefaultClusterCallback callback) {
       barrierControlStop(chipClusterPtr, callback);
     }
 
-    private native void barrierControlGoToPercent(
-        long chipClusterPtr, DefaultClusterCallback callback, int percentOpen);
-
+    private native void barrierControlGoToPercent(long chipClusterPtr, DefaultClusterCallback callback, int percentOpen);
     private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readBarrierMovingStateAttribute(IntegerAttributeCallback callback) {
+
+    public void readBarrierMovingStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBarrierMovingStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierSafetyStatusAttribute(IntegerAttributeCallback callback) {
+    public void readBarrierSafetyStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierCapabilitiesAttribute(IntegerAttributeCallback callback) {
+    public void readBarrierCapabilitiesAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierPositionAttribute(IntegerAttributeCallback callback) {
+    public void readBarrierPositionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBarrierPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readBarrierMovingStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBarrierSafetyStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBarrierCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBarrierPositionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readBarrierMovingStateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBarrierSafetyStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBarrierCapabilitiesAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBarrierPositionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BasicCluster extends BaseChipCluster {
@@ -480,27 +511,40 @@ public void mfgSpecificPing(DefaultClusterCallback callback) {
 
     private native void mfgSpecificPing(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readInteractionModelVersionAttribute(IntegerAttributeCallback callback) {
+
+    public void readInteractionModelVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInteractionModelVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
+    public void readVendorIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readVendorIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductNameAttribute(CharStringAttributeCallback callback) {
+    public void readProductNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductIDAttribute(IntegerAttributeCallback callback) {
+    public void readProductIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readProductIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readUserLabelAttribute(CharStringAttributeCallback callback) {
+    public void readUserLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readUserLabelAttribute(chipClusterPtr, callback);
     }
 
@@ -508,7 +552,9 @@ public void writeUserLabelAttribute(DefaultClusterCallback callback, String valu
       writeUserLabelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readLocationAttribute(CharStringAttributeCallback callback) {
+    public void readLocationAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readLocationAttribute(chipClusterPtr, callback);
     }
 
@@ -516,43 +562,63 @@ public void writeLocationAttribute(DefaultClusterCallback callback, String value
       writeLocationAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
+    public void readHardwareVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readHardwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
+    public void readHardwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readHardwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
+    public void readSoftwareVersionAttribute(
+      LongAttributeCallback callback
+    ) {
       readSoftwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
+    public void readSoftwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readSoftwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
+    public void readManufacturingDateAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readManufacturingDateAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
+    public void readPartNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readPartNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductURLAttribute(CharStringAttributeCallback callback) {
+    public void readProductURLAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductURLAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
+    public void readProductLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductLabelAttribute(chipClusterPtr, callback);
     }
 
-    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
+    public void readSerialNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readSerialNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readLocalConfigDisabledAttribute(BooleanAttributeCallback callback) {
+    public void readLocalConfigDisabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readLocalConfigDisabledAttribute(chipClusterPtr, callback);
     }
 
@@ -560,79 +626,99 @@ public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, b
       writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readReachableAttribute(BooleanAttributeCallback callback) {
+    public void readReachableAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readReachableAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readInteractionModelVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readVendorNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readVendorIDAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readProductNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductIDAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readUserLabelAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
 
-    private native void readInteractionModelVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeUserLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
+  
+    private native void readLocationAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
 
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readVendorIDAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readProductNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductIDAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readUserLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeUserLabelAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, String value);
-
-    private native void readLocationAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeLocationAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, String value);
-
-    private native void readHardwareVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readHardwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readSoftwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readManufacturingDateAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readPartNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductURLAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readSerialNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readLocalConfigDisabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writeLocalConfigDisabledAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-
-    private native void readReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void writeLocationAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
+  
+    private native void readHardwareVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readSoftwareVersionAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readManufacturingDateAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readPartNumberAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductURLAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductLabelAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readSerialNumberAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readLocalConfigDisabledAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeLocalConfigDisabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+  
+    private native void readReachableAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BinaryInputBasicCluster extends BaseChipCluster {
@@ -647,7 +733,10 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readOutOfServiceAttribute(BooleanAttributeCallback callback) {
+
+    public void readOutOfServiceAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readOutOfServiceAttribute(chipClusterPtr, callback);
     }
 
@@ -655,7 +744,9 @@ public void writeOutOfServiceAttribute(DefaultClusterCallback callback, boolean
       writeOutOfServiceAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readPresentValueAttribute(BooleanAttributeCallback callback) {
+    public void readPresentValueAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readPresentValueAttribute(chipClusterPtr, callback);
     }
 
@@ -663,8 +754,7 @@ public void writePresentValueAttribute(DefaultClusterCallback callback, boolean
       writePresentValueAttribute(chipClusterPtr, callback, value);
     }
 
-    public void subscribePresentValueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribePresentValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribePresentValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -672,12 +762,13 @@ public void reportPresentValueAttribute(BooleanAttributeCallback callback) {
       reportPresentValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readStatusFlagsAttribute(IntegerAttributeCallback callback) {
+    public void readStatusFlagsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStatusFlagsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStatusFlagsAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeStatusFlagsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeStatusFlagsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -685,39 +776,39 @@ public void reportStatusFlagsAttribute(IntegerAttributeCallback callback) {
       reportStatusFlagsAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readOutOfServiceAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void readOutOfServiceAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writeOutOfServiceAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-
-    private native void readPresentValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void writePresentValueAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-
-    private native void subscribePresentValueAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void writeOutOfServiceAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+  
+    private native void readPresentValueAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void reportPresentValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void writePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
 
-    private native void readStatusFlagsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeStatusFlagsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportPresentValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+  
+    private native void readStatusFlagsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportStatusFlagsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeStatusFlagsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportStatusFlagsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BindingCluster extends BaseChipCluster {
@@ -732,38 +823,28 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void bind(
-        DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
+    public void bind(DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
       bind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId);
     }
 
-    public void unbind(
-        DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
+
+    public void unbind(DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
       unbind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId);
     }
 
-    private native void bind(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        long nodeId,
-        int groupId,
-        int endpointId,
-        long clusterId);
+    private native void bind(long chipClusterPtr, DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId);
+    private native void unbind(long chipClusterPtr, DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId);
 
-    private native void unbind(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        long nodeId,
-        int groupId,
-        int endpointId,
-        long clusterId);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BooleanStateCluster extends BaseChipCluster {
@@ -778,12 +859,14 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readStateValueAttribute(BooleanAttributeCallback callback) {
+
+    public void readStateValueAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readStateValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStateValueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeStateValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -791,21 +874,23 @@ public void reportStateValueAttribute(BooleanAttributeCallback callback) {
       reportStateValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readStateValueAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void readStateValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeStateValueAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportStateValueAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void subscribeStateValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportStateValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BridgedActionsCluster extends BaseChipCluster {
@@ -824,126 +909,90 @@ public void disableAction(DefaultClusterCallback callback, int actionID, long in
       disableAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    public void disableActionWithDuration(
-        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+
+    public void disableActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
+
     public void enableAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       enableAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    public void enableActionWithDuration(
-        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+
+    public void enableActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
+
     public void instantAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       instantAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    public void instantActionWithTransition(
-        DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime) {
+
+    public void instantActionWithTransition(DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime) {
       instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime);
     }
 
+
     public void pauseAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       pauseAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    public void pauseActionWithDuration(
-        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+
+    public void pauseActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
+
     public void resumeAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       resumeAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
+
     public void startAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       startAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    public void startActionWithDuration(
-        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+
+    public void startActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
+
     public void stopAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       stopAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    private native void disableAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void disableActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int actionID,
-        long invokeID,
-        long duration);
-
-    private native void enableAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void enableActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int actionID,
-        long invokeID,
-        long duration);
-
-    private native void instantAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void instantActionWithTransition(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int actionID,
-        long invokeID,
-        int transitionTime);
-
-    private native void pauseAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void pauseActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int actionID,
-        long invokeID,
-        long duration);
-
-    private native void resumeAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void startAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-
-    private native void startActionWithDuration(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int actionID,
-        long invokeID,
-        long duration);
-
-    private native void stopAction(
-        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void disableAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void disableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
+    private native void enableAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void enableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
+    private native void instantAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void instantActionWithTransition(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime);
+    private native void pauseAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void pauseActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
+    private native void resumeAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void startAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void startActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
+    private native void stopAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
 
     public static class ActionListAttribute {
       public int actionID;
-      public String name;
+            public String name;
       public int type;
-      public int endpointListID;
-      public int supportedCommands;
-      public int status;
-
+            public int endpointListID;
+            public int supportedCommands;
+            public int status;
+      
       public ActionListAttribute(
-          int actionID,
-          String name,
-          int type,
-          int endpointListID,
-          int supportedCommands,
-          int status) {
+        int actionID,
+                String name,
+        int type,
+                int endpointListID,
+                int supportedCommands,
+                int status
+              ) {
         this.actionID = actionID;
         this.name = name;
         this.type = type;
@@ -954,18 +1003,23 @@ public ActionListAttribute(
     }
 
     public interface ActionListAttributeCallback {
-      void onSuccess(List<ActionListAttribute> valueList);
-
+      void onSuccess(List<
+      ActionListAttribute
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class EndpointListAttribute {
       public int endpointListID;
-      public String name;
+            public String name;
       public int type;
-      public byte[] endpoints;
-
-      public EndpointListAttribute(int endpointListID, String name, int type, byte[] endpoints) {
+            public byte[] endpoints;
+
+      public EndpointListAttribute(
+        int endpointListID,
+                String name,
+        int type,
+                byte[] endpoints
+      ) {
         this.endpointListID = endpointListID;
         this.name = name;
         this.type = type;
@@ -974,38 +1028,51 @@ public EndpointListAttribute(int endpointListID, String name, int type, byte[] e
     }
 
     public interface EndpointListAttributeCallback {
-      void onSuccess(List<EndpointListAttribute> valueList);
-
+      void onSuccess(List<
+      EndpointListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readActionListAttribute(ActionListAttributeCallback callback) {
+    public void readActionListAttribute(
+      ActionListAttributeCallback callback
+    ) {
       readActionListAttribute(chipClusterPtr, callback);
     }
 
-    public void readEndpointListAttribute(EndpointListAttributeCallback callback) {
+    public void readEndpointListAttribute(
+      EndpointListAttributeCallback callback
+    ) {
       readEndpointListAttribute(chipClusterPtr, callback);
     }
 
-    public void readSetupUrlAttribute(CharStringAttributeCallback callback) {
+    public void readSetupUrlAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readSetupUrlAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readActionListAttribute(
-        long chipClusterPtr, ActionListAttributeCallback callback);
-
-    private native void readEndpointListAttribute(
-        long chipClusterPtr, EndpointListAttributeCallback callback);
-
-    private native void readSetupUrlAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readActionListAttribute(long chipClusterPtr,
+      ActionListAttributeCallback callback
+    );
+  
+    private native void readEndpointListAttribute(long chipClusterPtr,
+      EndpointListAttributeCallback callback
+    );
+  
+    private native void readSetupUrlAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class BridgedDeviceBasicCluster extends BaseChipCluster {
@@ -1020,19 +1087,28 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
+
+    public void readVendorNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
+    public void readVendorIDAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readVendorIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductNameAttribute(CharStringAttributeCallback callback) {
+    public void readProductNameAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readUserLabelAttribute(CharStringAttributeCallback callback) {
+    public void readUserLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readUserLabelAttribute(chipClusterPtr, callback);
     }
 
@@ -1040,97 +1116,133 @@ public void writeUserLabelAttribute(DefaultClusterCallback callback, String valu
       writeUserLabelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
+    public void readHardwareVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readHardwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
+    public void readHardwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readHardwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
+    public void readSoftwareVersionAttribute(
+      LongAttributeCallback callback
+    ) {
       readSoftwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
+    public void readSoftwareVersionStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readSoftwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
+    public void readManufacturingDateAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readManufacturingDateAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
+    public void readPartNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readPartNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductURLAttribute(CharStringAttributeCallback callback) {
+    public void readProductURLAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductURLAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
+    public void readProductLabelAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readProductLabelAttribute(chipClusterPtr, callback);
     }
 
-    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
+    public void readSerialNumberAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readSerialNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readReachableAttribute(BooleanAttributeCallback callback) {
+    public void readReachableAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readReachableAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readVendorNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readVendorIDAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readProductNameAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readUserLabelAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
 
-    private native void readVendorNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readVendorIDAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readProductNameAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readUserLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void writeUserLabelAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, String value);
-
-    private native void readHardwareVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readHardwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readSoftwareVersionAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readSoftwareVersionStringAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readManufacturingDateAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readPartNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductURLAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readProductLabelAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readSerialNumberAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readReachableAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeUserLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
+  
+    private native void readHardwareVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readSoftwareVersionAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readManufacturingDateAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readPartNumberAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductURLAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readProductLabelAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readSerialNumberAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readReachableAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class ColorControlCluster extends BaseChipCluster {
@@ -1145,427 +1257,128 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void colorLoopSet(
-        DefaultClusterCallback callback,
-        int updateFlags,
-        int action,
-        int direction,
-        int time,
-        int startHue,
-        int optionsMask,
-        int optionsOverride) {
-      colorLoopSet(
-          chipClusterPtr,
-          callback,
-          updateFlags,
-          action,
-          direction,
-          time,
-          startHue,
-          optionsMask,
-          optionsOverride);
+    public void colorLoopSet(DefaultClusterCallback callback, int updateFlags, int action, int direction, int time, int startHue, int optionsMask, int optionsOverride) {
+      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride);
     }
 
-    public void enhancedMoveHue(
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride) {
+
+    public void enhancedMoveHue(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
       enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
     }
 
-    public void enhancedMoveToHue(
-        DefaultClusterCallback callback,
-        int enhancedHue,
-        int direction,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      enhancedMoveToHue(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          direction,
-          transitionTime,
-          optionsMask,
-          optionsOverride);
-    }
 
-    public void enhancedMoveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        int enhancedHue,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      enhancedMoveToHueAndSaturation(
-          chipClusterPtr,
-          callback,
-          enhancedHue,
-          saturation,
-          transitionTime,
-          optionsMask,
-          optionsOverride);
+    public void enhancedMoveToHue(DefaultClusterCallback callback, int enhancedHue, int direction, int transitionTime, int optionsMask, int optionsOverride) {
+      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride);
     }
 
-    public void enhancedStepHue(
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      enhancedStepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride);
-    }
 
-    public void moveColor(
-        DefaultClusterCallback callback,
-        int rateX,
-        int rateY,
-        int optionsMask,
-        int optionsOverride) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride);
+    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, int enhancedHue, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
+      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride);
     }
 
-    public void moveColorTemperature(
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int colorTemperatureMinimum,
-        int colorTemperatureMaximum,
-        int optionsMask,
-        int optionsOverride) {
-      moveColorTemperature(
-          chipClusterPtr,
-          callback,
-          moveMode,
-          rate,
-          colorTemperatureMinimum,
-          colorTemperatureMaximum,
-          optionsMask,
-          optionsOverride);
-    }
 
-    public void moveHue(
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride) {
-      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
+    public void enhancedStepHue(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
+      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
     }
 
-    public void moveSaturation(
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride) {
-      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
-    }
 
-    public void moveToColor(
-        DefaultClusterCallback callback,
-        int colorX,
-        int colorY,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      moveToColor(
-          chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    public void moveColor(DefaultClusterCallback callback, int rateX, int rateY, int optionsMask, int optionsOverride) {
+      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride);
     }
 
-    public void moveToColorTemperature(
-        DefaultClusterCallback callback,
-        int colorTemperature,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      moveToColorTemperature(
-          chipClusterPtr, callback, colorTemperature, transitionTime, optionsMask, optionsOverride);
-    }
 
-    public void moveToHue(
-        DefaultClusterCallback callback,
-        int hue,
-        int direction,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      moveToHue(
-          chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride);
+    public void moveColorTemperature(DefaultClusterCallback callback, int moveMode, int rate, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride) {
+      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
     }
 
-    public void moveToHueAndSaturation(
-        DefaultClusterCallback callback,
-        int hue,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      moveToHueAndSaturation(
-          chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride);
-    }
 
-    public void moveToSaturation(
-        DefaultClusterCallback callback,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      moveToSaturation(
-          chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride);
+    public void moveHue(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
+      moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
     }
 
-    public void stepColor(
-        DefaultClusterCallback callback,
-        int stepX,
-        int stepY,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      stepColor(
-          chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride);
-    }
 
-    public void stepColorTemperature(
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int colorTemperatureMinimum,
-        int colorTemperatureMaximum,
-        int optionsMask,
-        int optionsOverride) {
-      stepColorTemperature(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          colorTemperatureMinimum,
-          colorTemperatureMaximum,
-          optionsMask,
-          optionsOverride);
+    public void moveSaturation(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
+      moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
     }
 
-    public void stepHue(
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      stepHue(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride);
-    }
 
-    public void stepSaturation(
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride) {
-      stepSaturation(
-          chipClusterPtr,
-          callback,
-          stepMode,
-          stepSize,
-          transitionTime,
-          optionsMask,
-          optionsOverride);
+    public void moveToColor(DefaultClusterCallback callback, int colorX, int colorY, int transitionTime, int optionsMask, int optionsOverride) {
+      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride);
     }
 
-    public void stopMoveStep(
-        DefaultClusterCallback callback, int optionsMask, int optionsOverride) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride);
+
+    public void moveToColorTemperature(DefaultClusterCallback callback, int colorTemperature, int transitionTime, int optionsMask, int optionsOverride) {
+      moveToColorTemperature(chipClusterPtr, callback, colorTemperature, transitionTime, optionsMask, optionsOverride);
     }
 
-    private native void colorLoopSet(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int updateFlags,
-        int action,
-        int direction,
-        int time,
-        int startHue,
-        int optionsMask,
-        int optionsOverride);
-
-    private native void enhancedMoveHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void enhancedMoveToHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int enhancedHue,
-        int direction,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void moveToHue(DefaultClusterCallback callback, int hue, int direction, int transitionTime, int optionsMask, int optionsOverride) {
+      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void enhancedMoveToHueAndSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int enhancedHue,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void enhancedStepHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void moveToHueAndSaturation(DefaultClusterCallback callback, int hue, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
+      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void moveColor(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int rateX,
-        int rateY,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void moveColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int colorTemperatureMinimum,
-        int colorTemperatureMaximum,
-        int optionsMask,
-        int optionsOverride);
-
-    private native void moveHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride);
+    public void moveToSaturation(DefaultClusterCallback callback, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
+      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void moveSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void moveToColor(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int colorX,
-        int colorY,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void stepColor(DefaultClusterCallback callback, int stepX, int stepY, int transitionTime, int optionsMask, int optionsOverride) {
+      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void moveToColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int colorTemperature,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void moveToHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int hue,
-        int direction,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void stepColorTemperature(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride) {
+      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    }
 
-    private native void moveToHueAndSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int hue,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void moveToSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int saturation,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void stepHue(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
+      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void stepColor(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepX,
-        int stepY,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void stepColorTemperature(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int colorTemperatureMinimum,
-        int colorTemperatureMaximum,
-        int optionsMask,
-        int optionsOverride);
-
-    private native void stepHue(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
+    public void stepSaturation(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
+      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    }
 
-    private native void stepSaturation(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionsMask,
-        int optionsOverride);
 
-    private native void stopMoveStep(
-        long chipClusterPtr, DefaultClusterCallback callback, int optionsMask, int optionsOverride);
+    public void stopMoveStep(DefaultClusterCallback callback, int optionsMask, int optionsOverride) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride);
+    }
 
-    public void readCurrentHueAttribute(IntegerAttributeCallback callback) {
+    private native void colorLoopSet(long chipClusterPtr, DefaultClusterCallback callback, int updateFlags, int action, int direction, int time, int startHue, int optionsMask, int optionsOverride);
+    private native void enhancedMoveHue(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
+    private native void enhancedMoveToHue(long chipClusterPtr, DefaultClusterCallback callback, int enhancedHue, int direction, int transitionTime, int optionsMask, int optionsOverride);
+    private native void enhancedMoveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, int enhancedHue, int saturation, int transitionTime, int optionsMask, int optionsOverride);
+    private native void enhancedStepHue(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
+    private native void moveColor(long chipClusterPtr, DefaultClusterCallback callback, int rateX, int rateY, int optionsMask, int optionsOverride);
+    private native void moveColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride);
+    private native void moveHue(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
+    private native void moveSaturation(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
+    private native void moveToColor(long chipClusterPtr, DefaultClusterCallback callback, int colorX, int colorY, int transitionTime, int optionsMask, int optionsOverride);
+    private native void moveToColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int colorTemperature, int transitionTime, int optionsMask, int optionsOverride);
+    private native void moveToHue(long chipClusterPtr, DefaultClusterCallback callback, int hue, int direction, int transitionTime, int optionsMask, int optionsOverride);
+    private native void moveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, int hue, int saturation, int transitionTime, int optionsMask, int optionsOverride);
+    private native void moveToSaturation(long chipClusterPtr, DefaultClusterCallback callback, int saturation, int transitionTime, int optionsMask, int optionsOverride);
+    private native void stepColor(long chipClusterPtr, DefaultClusterCallback callback, int stepX, int stepY, int transitionTime, int optionsMask, int optionsOverride);
+    private native void stepColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride);
+    private native void stepHue(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
+    private native void stepSaturation(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
+    private native void stopMoveStep(long chipClusterPtr, DefaultClusterCallback callback, int optionsMask, int optionsOverride);
+
+
+    public void readCurrentHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentHueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentHueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1573,12 +1386,13 @@ public void reportCurrentHueAttribute(IntegerAttributeCallback callback) {
       reportCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentSaturationAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentSaturationAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentSaturationAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentSaturationAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentSaturationAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1586,16 +1400,19 @@ public void reportCurrentSaturationAttribute(IntegerAttributeCallback callback)
       reportCurrentSaturationAttribute(chipClusterPtr, callback);
     }
 
-    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
+    public void readRemainingTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentXAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentXAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentXAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentXAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentXAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1603,12 +1420,13 @@ public void reportCurrentXAttribute(IntegerAttributeCallback callback) {
       reportCurrentXAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentYAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentYAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentYAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentYAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentYAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1616,20 +1434,25 @@ public void reportCurrentYAttribute(IntegerAttributeCallback callback) {
       reportCurrentYAttribute(chipClusterPtr, callback);
     }
 
-    public void readDriftCompensationAttribute(IntegerAttributeCallback callback) {
+    public void readDriftCompensationAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readDriftCompensationAttribute(chipClusterPtr, callback);
     }
 
-    public void readCompensationTextAttribute(CharStringAttributeCallback callback) {
+    public void readCompensationTextAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readCompensationTextAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTemperatureAttribute(IntegerAttributeCallback callback) {
+    public void readColorTemperatureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeColorTemperatureAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeColorTemperatureAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeColorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1637,11 +1460,15 @@ public void reportColorTemperatureAttribute(IntegerAttributeCallback callback) {
       reportColorTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorModeAttribute(IntegerAttributeCallback callback) {
+    public void readColorModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorControlOptionsAttribute(IntegerAttributeCallback callback) {
+    public void readColorControlOptionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorControlOptionsAttribute(chipClusterPtr, callback);
     }
 
@@ -1649,83 +1476,123 @@ public void writeColorControlOptionsAttribute(DefaultClusterCallback callback, i
       writeColorControlOptionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readNumberOfPrimariesAttribute(IntegerAttributeCallback callback) {
+    public void readNumberOfPrimariesAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNumberOfPrimariesAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary1XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary1XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary1YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary1YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary1IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary1IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary2XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary2XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary2YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary2YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary2IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary2IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary3XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary3XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary3YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary3YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary3IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary3IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary4XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary4XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary4YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary4YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary4IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary4IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary5XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary5XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary5YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary5YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary5IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary5IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6XAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary6XAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary6XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6YAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary6YAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary6YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6IntensityAttribute(IntegerAttributeCallback callback) {
+    public void readPrimary6IntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPrimary6IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readWhitePointXAttribute(IntegerAttributeCallback callback) {
+    public void readWhitePointXAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readWhitePointXAttribute(chipClusterPtr, callback);
     }
 
@@ -1733,7 +1600,9 @@ public void writeWhitePointXAttribute(DefaultClusterCallback callback, int value
       writeWhitePointXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readWhitePointYAttribute(IntegerAttributeCallback callback) {
+    public void readWhitePointYAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readWhitePointYAttribute(chipClusterPtr, callback);
     }
 
@@ -1741,7 +1610,9 @@ public void writeWhitePointYAttribute(DefaultClusterCallback callback, int value
       writeWhitePointYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRXAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointRXAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointRXAttribute(chipClusterPtr, callback);
     }
 
@@ -1749,7 +1620,9 @@ public void writeColorPointRXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointRXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRYAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointRYAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointRYAttribute(chipClusterPtr, callback);
     }
 
@@ -1757,7 +1630,9 @@ public void writeColorPointRYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointRYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRIntensityAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointRIntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointRIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1765,7 +1640,9 @@ public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointRIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGXAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointGXAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointGXAttribute(chipClusterPtr, callback);
     }
 
@@ -1773,7 +1650,9 @@ public void writeColorPointGXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointGXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGYAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointGYAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointGYAttribute(chipClusterPtr, callback);
     }
 
@@ -1781,7 +1660,9 @@ public void writeColorPointGYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointGYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGIntensityAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointGIntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointGIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1789,7 +1670,9 @@ public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointGIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBXAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointBXAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointBXAttribute(chipClusterPtr, callback);
     }
 
@@ -1797,7 +1680,9 @@ public void writeColorPointBXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointBXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBYAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointBYAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointBYAttribute(chipClusterPtr, callback);
     }
 
@@ -1805,7 +1690,9 @@ public void writeColorPointBYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointBYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBIntensityAttribute(IntegerAttributeCallback callback) {
+    public void readColorPointBIntensityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorPointBIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1813,450 +1700,537 @@ public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointBIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnhancedCurrentHueAttribute(IntegerAttributeCallback callback) {
+    public void readEnhancedCurrentHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readEnhancedColorModeAttribute(IntegerAttributeCallback callback) {
+    public void readEnhancedColorModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readEnhancedColorModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopActiveAttribute(IntegerAttributeCallback callback) {
+    public void readColorLoopActiveAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorLoopActiveAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopDirectionAttribute(IntegerAttributeCallback callback) {
+    public void readColorLoopDirectionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorLoopDirectionAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopTimeAttribute(IntegerAttributeCallback callback) {
+    public void readColorLoopTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorLoopTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopStartEnhancedHueAttribute(IntegerAttributeCallback callback) {
+    public void readColorLoopStartEnhancedHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopStoredEnhancedHueAttribute(IntegerAttributeCallback callback) {
+    public void readColorLoopStoredEnhancedHueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorCapabilitiesAttribute(IntegerAttributeCallback callback) {
+    public void readColorCapabilitiesAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorCapabilitiesAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTempPhysicalMinAttribute(IntegerAttributeCallback callback) {
+    public void readColorTempPhysicalMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorTempPhysicalMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTempPhysicalMaxAttribute(IntegerAttributeCallback callback) {
+    public void readColorTempPhysicalMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readColorTempPhysicalMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readCoupleColorTempToLevelMinMiredsAttribute(IntegerAttributeCallback callback) {
+    public void readCoupleColorTempToLevelMinMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void readStartUpColorTemperatureMiredsAttribute(IntegerAttributeCallback callback) {
+    public void readStartUpColorTemperatureMiredsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void writeStartUpColorTemperatureMiredsAttribute(
-        DefaultClusterCallback callback, int value) {
+    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, int value) {
       writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readCurrentHueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentHueAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentHueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCurrentSaturationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readCurrentSaturationAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void subscribeCurrentSaturationAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentSaturationAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportCurrentSaturationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentSaturationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readRemainingTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentXAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readCurrentYAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void subscribeCurrentXAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportCurrentXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readDriftCompensationAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCompensationTextAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readColorTemperatureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCurrentYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeColorTemperatureAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCurrentYAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportColorTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readColorModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorControlOptionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportCurrentYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorControlOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readNumberOfPrimariesAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary1XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary1YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary1IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary2XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary2YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary2IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary3XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary3YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary3IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary4XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary4YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary4IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary5XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary5YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary5IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary6XAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary6YAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPrimary6IntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readWhitePointXAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readDriftCompensationAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeWhitePointXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readWhitePointYAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCompensationTextAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
+    private native void writeWhitePointYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointRXAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readColorTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointRXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointRYAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void subscribeColorTemperatureAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void writeColorPointRYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointRIntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportColorTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointRIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointGXAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readColorModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointGXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointGYAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readColorControlOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointGYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointGIntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeColorControlOptionsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeColorPointGIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointBXAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readNumberOfPrimariesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointBXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointBYAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readPrimary1XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointBYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readColorPointBIntensityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readPrimary1YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeColorPointBIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readEnhancedCurrentHueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readEnhancedColorModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorLoopActiveAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorLoopDirectionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorLoopTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorLoopStartEnhancedHueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorLoopStoredEnhancedHueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorCapabilitiesAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorTempPhysicalMinAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readColorTempPhysicalMaxAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readStartUpColorTemperatureMiredsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readPrimary1IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  }
 
-    private native void readPrimary2XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class ContentLauncherCluster extends BaseChipCluster {
+    public ContentLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void readPrimary2YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public static long clusterId() {
+      return Long.parseUnsignedLong("1290");
+    }
 
-    private native void readPrimary2IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void readPrimary3XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void launchContent(LaunchContentResponseCallback callback, boolean autoPlay, String data) {
+      launchContent(chipClusterPtr, callback, autoPlay, data);
+    }
 
-    private native void readPrimary3YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readPrimary3IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void launchURL(LaunchURLResponseCallback callback, String contentURL, String displayString) {
+      launchURL(chipClusterPtr, callback, contentURL, displayString);
+    }
 
-    private native void readPrimary4XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void launchContent(long chipClusterPtr, LaunchContentResponseCallback callback, boolean autoPlay, String data);
+    private native void launchURL(long chipClusterPtr, LaunchURLResponseCallback callback, String contentURL, String displayString);
+    public interface LaunchContentResponseCallback {
+      void onSuccess(
+      String data
+      , int contentLaunchStatus
+      );
+      
+      void onError(Exception error);
+    }
 
-    private native void readPrimary4YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface LaunchURLResponseCallback {
+      void onSuccess(
+      String data
+      , int contentLaunchStatus
+      );
+      
+      void onError(Exception error);
+    }
 
-    private native void readPrimary4IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readPrimary5XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void readPrimary5YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface AcceptsHeaderListAttributeCallback {
+      void onSuccess(List<
+        byte[]
+      > valueList);
+      void onError(Exception ex);
+    }
 
-    private native void readPrimary5IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public interface SupportedStreamingTypesAttributeCallback {
+      void onSuccess(List<
+        Integer
+              > valueList);
+      void onError(Exception ex);
+    }
 
-    private native void readPrimary6XAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readAcceptsHeaderListAttribute(
+      AcceptsHeaderListAttributeCallback callback
+    ) {
+      readAcceptsHeaderListAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readPrimary6YAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readSupportedStreamingTypesAttribute(
+      SupportedStreamingTypesAttributeCallback callback
+    ) {
+      readSupportedStreamingTypesAttribute(chipClusterPtr, callback);
+    }
 
-    private native void readPrimary6IntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+  
+    private native void readAcceptsHeaderListAttribute(long chipClusterPtr,
+      AcceptsHeaderListAttributeCallback callback
+    );
+  
+    private native void readSupportedStreamingTypesAttribute(long chipClusterPtr,
+      SupportedStreamingTypesAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  }
 
-    private native void readWhitePointXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  public static class DescriptorCluster extends BaseChipCluster {
+    public DescriptorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void writeWhitePointXAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    public static long clusterId() {
+      return Long.parseUnsignedLong("29");
+    }
 
-    private native void readWhitePointYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeWhitePointYAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointRXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointRXAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointRYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointRYAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointRIntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointRIntensityAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointGXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointGXAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointGYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointGYAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointGIntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointGIntensityAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointBXAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointBXAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointBYAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointBYAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readColorPointBIntensityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeColorPointBIntensityAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readEnhancedCurrentHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readEnhancedColorModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorLoopActiveAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorLoopDirectionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorLoopTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorLoopStartEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorLoopStoredEnhancedHueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorCapabilitiesAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorTempPhysicalMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readColorTempPhysicalMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCoupleColorTempToLevelMinMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readStartUpColorTemperatureMiredsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeStartUpColorTemperatureMiredsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-  }
-
-  public static class ContentLauncherCluster extends BaseChipCluster {
-    public ContentLauncherCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    public static long clusterId() {
-      return Long.parseUnsignedLong("1290");
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void launchContent(
-        LaunchContentResponseCallback callback, boolean autoPlay, String data) {
-      launchContent(chipClusterPtr, callback, autoPlay, data);
-    }
-
-    public void launchURL(
-        LaunchURLResponseCallback callback, String contentURL, String displayString) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString);
-    }
-
-    private native void launchContent(
-        long chipClusterPtr, LaunchContentResponseCallback callback, boolean autoPlay, String data);
-
-    private native void launchURL(
-        long chipClusterPtr,
-        LaunchURLResponseCallback callback,
-        String contentURL,
-        String displayString);
-
-    public interface LaunchContentResponseCallback {
-      void onSuccess(String data, int contentLaunchStatus);
-
-      void onError(Exception error);
-    }
-
-    public interface LaunchURLResponseCallback {
-      void onSuccess(String data, int contentLaunchStatus);
-
-      void onError(Exception error);
-    }
-
-    public interface AcceptsHeaderListAttributeCallback {
-      void onSuccess(List<byte[]> valueList);
-
-      void onError(Exception ex);
-    }
-
-    public interface SupportedStreamingTypesAttributeCallback {
-      void onSuccess(List<Integer> valueList);
-
-      void onError(Exception ex);
-    }
-
-    public void readAcceptsHeaderListAttribute(AcceptsHeaderListAttributeCallback callback) {
-      readAcceptsHeaderListAttribute(chipClusterPtr, callback);
-    }
-
-    public void readSupportedStreamingTypesAttribute(
-        SupportedStreamingTypesAttributeCallback callback) {
-      readSupportedStreamingTypesAttribute(chipClusterPtr, callback);
-    }
-
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    private native void readAcceptsHeaderListAttribute(
-        long chipClusterPtr, AcceptsHeaderListAttributeCallback callback);
-
-    private native void readSupportedStreamingTypesAttribute(
-        long chipClusterPtr, SupportedStreamingTypesAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-  }
-
-  public static class DescriptorCluster extends BaseChipCluster {
-    public DescriptorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    public static long clusterId() {
-      return Long.parseUnsignedLong("29");
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
     public static class DeviceListAttribute {
       public long type;
-      public int revision;
-
-      public DeviceListAttribute(long type, int revision) {
+            public int revision;
+      
+      public DeviceListAttribute(
+        long type,
+                int revision
+              ) {
         this.type = type;
         this.revision = revision;
       }
     }
 
     public interface DeviceListAttributeCallback {
-      void onSuccess(List<DeviceListAttribute> valueList);
-
+      void onSuccess(List<
+      DeviceListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
     public interface ServerListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
+      void onSuccess(List<
+        Long
+              > valueList);
       void onError(Exception ex);
     }
 
     public interface ClientListAttributeCallback {
-      void onSuccess(List<Long> valueList);
-
+      void onSuccess(List<
+        Long
+              > valueList);
       void onError(Exception ex);
     }
 
     public interface PartsListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
-
+      void onSuccess(List<
+        Integer
+              > valueList);
       void onError(Exception ex);
     }
 
-    public void readDeviceListAttribute(DeviceListAttributeCallback callback) {
+    public void readDeviceListAttribute(
+      DeviceListAttributeCallback callback
+    ) {
       readDeviceListAttribute(chipClusterPtr, callback);
     }
 
-    public void readServerListAttribute(ServerListAttributeCallback callback) {
+    public void readServerListAttribute(
+      ServerListAttributeCallback callback
+    ) {
       readServerListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClientListAttribute(ClientListAttributeCallback callback) {
+    public void readClientListAttribute(
+      ClientListAttributeCallback callback
+    ) {
       readClientListAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartsListAttribute(PartsListAttributeCallback callback) {
+    public void readPartsListAttribute(
+      PartsListAttributeCallback callback
+    ) {
       readPartsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readDeviceListAttribute(
-        long chipClusterPtr, DeviceListAttributeCallback callback);
-
-    private native void readServerListAttribute(
-        long chipClusterPtr, ServerListAttributeCallback callback);
-
-    private native void readClientListAttribute(
-        long chipClusterPtr, ClientListAttributeCallback callback);
-
-    private native void readPartsListAttribute(
-        long chipClusterPtr, PartsListAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readDeviceListAttribute(long chipClusterPtr,
+      DeviceListAttributeCallback callback
+    );
+  
+    private native void readServerListAttribute(long chipClusterPtr,
+      ServerListAttributeCallback callback
+    );
+  
+    private native void readClientListAttribute(long chipClusterPtr,
+      ClientListAttributeCallback callback
+    );
+  
+    private native void readPartsListAttribute(long chipClusterPtr,
+      PartsListAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class DiagnosticLogsCluster extends BaseChipCluster {
@@ -2271,27 +2245,23 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void retrieveLogsRequest(
-        RetrieveLogsResponseCallback callback,
-        int intent,
-        int requestedProtocol,
-        byte[] transferFileDesignator) {
-      retrieveLogsRequest(
-          chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator);
+    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, int intent, int requestedProtocol, byte[] transferFileDesignator) {
+      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator);
     }
 
-    private native void retrieveLogsRequest(
-        long chipClusterPtr,
-        RetrieveLogsResponseCallback callback,
-        int intent,
-        int requestedProtocol,
-        byte[] transferFileDesignator);
-
+    private native void retrieveLogsRequest(long chipClusterPtr, RetrieveLogsResponseCallback callback, int intent, int requestedProtocol, byte[] transferFileDesignator);
     public interface RetrieveLogsResponseCallback {
-      void onSuccess(int status, byte[] content, long timeStamp, long timeSinceBoot);
-
+      void onSuccess(
+      int status
+      , byte[] content
+      , long timeStamp
+      , long timeSinceBoot
+      );
+      
       void onError(Exception error);
     }
+
+
   }
 
   public static class DoorLockCluster extends BaseChipCluster {
@@ -2310,409 +2280,360 @@ public void clearAllPins(ClearAllPinsResponseCallback callback) {
       clearAllPins(chipClusterPtr, callback);
     }
 
+
     public void clearAllRfids(ClearAllRfidsResponseCallback callback) {
       clearAllRfids(chipClusterPtr, callback);
     }
 
-    public void clearHolidaySchedule(
-        ClearHolidayScheduleResponseCallback callback, int scheduleId) {
+
+    public void clearHolidaySchedule(ClearHolidayScheduleResponseCallback callback, int scheduleId) {
       clearHolidaySchedule(chipClusterPtr, callback, scheduleId);
     }
 
+
     public void clearPin(ClearPinResponseCallback callback, int userId) {
       clearPin(chipClusterPtr, callback, userId);
     }
 
+
     public void clearRfid(ClearRfidResponseCallback callback, int userId) {
       clearRfid(chipClusterPtr, callback, userId);
     }
 
-    public void clearWeekdaySchedule(
-        ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
+
+    public void clearWeekdaySchedule(ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
       clearWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-    public void clearYeardaySchedule(
-        ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
+
+    public void clearYeardaySchedule(ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
       clearYeardaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
+
     public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, int scheduleId) {
       getHolidaySchedule(chipClusterPtr, callback, scheduleId);
     }
 
+
     public void getLogRecord(GetLogRecordResponseCallback callback, int logIndex) {
       getLogRecord(chipClusterPtr, callback, logIndex);
     }
 
+
     public void getPin(GetPinResponseCallback callback, int userId) {
       getPin(chipClusterPtr, callback, userId);
     }
 
+
     public void getRfid(GetRfidResponseCallback callback, int userId) {
       getRfid(chipClusterPtr, callback, userId);
     }
 
+
     public void getUserType(GetUserTypeResponseCallback callback, int userId) {
       getUserType(chipClusterPtr, callback, userId);
     }
 
-    public void getWeekdaySchedule(
-        GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
+
+    public void getWeekdaySchedule(GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
       getWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-    public void getYeardaySchedule(
-        GetYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
+
+    public void getYeardaySchedule(GetYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
       getYeardaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
+
     public void lockDoor(LockDoorResponseCallback callback, byte[] pin) {
       lockDoor(chipClusterPtr, callback, pin);
     }
 
-    public void setHolidaySchedule(
-        SetHolidayScheduleResponseCallback callback,
-        int scheduleId,
-        long localStartTime,
-        long localEndTime,
-        int operatingModeDuringHoliday) {
-      setHolidaySchedule(
-          chipClusterPtr,
-          callback,
-          scheduleId,
-          localStartTime,
-          localEndTime,
-          operatingModeDuringHoliday);
+
+    public void setHolidaySchedule(SetHolidayScheduleResponseCallback callback, int scheduleId, long localStartTime, long localEndTime, int operatingModeDuringHoliday) {
+      setHolidaySchedule(chipClusterPtr, callback, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
     }
 
-    public void setPin(
-        SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin) {
+
+    public void setPin(SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin) {
       setPin(chipClusterPtr, callback, userId, userStatus, userType, pin);
     }
 
-    public void setRfid(
-        SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id) {
+
+    public void setRfid(SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id) {
       setRfid(chipClusterPtr, callback, userId, userStatus, userType, id);
     }
 
+
     public void setUserType(SetUserTypeResponseCallback callback, int userId, int userType) {
       setUserType(chipClusterPtr, callback, userId, userType);
     }
 
-    public void setWeekdaySchedule(
-        SetWeekdayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId,
-        int daysMask,
-        int startHour,
-        int startMinute,
-        int endHour,
-        int endMinute) {
-      setWeekdaySchedule(
-          chipClusterPtr,
-          callback,
-          scheduleId,
-          userId,
-          daysMask,
-          startHour,
-          startMinute,
-          endHour,
-          endMinute);
+
+    public void setWeekdaySchedule(SetWeekdayScheduleResponseCallback callback, int scheduleId, int userId, int daysMask, int startHour, int startMinute, int endHour, int endMinute) {
+      setWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
     }
 
-    public void setYeardaySchedule(
-        SetYeardayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId,
-        long localStartTime,
-        long localEndTime) {
-      setYeardaySchedule(
-          chipClusterPtr, callback, scheduleId, userId, localStartTime, localEndTime);
+
+    public void setYeardaySchedule(SetYeardayScheduleResponseCallback callback, int scheduleId, int userId, long localStartTime, long localEndTime) {
+      setYeardaySchedule(chipClusterPtr, callback, scheduleId, userId, localStartTime, localEndTime);
     }
 
+
     public void unlockDoor(UnlockDoorResponseCallback callback, byte[] pin) {
       unlockDoor(chipClusterPtr, callback, pin);
     }
 
-    public void unlockWithTimeout(
-        UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin) {
+
+    public void unlockWithTimeout(UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin) {
       unlockWithTimeout(chipClusterPtr, callback, timeoutInSeconds, pin);
     }
 
     private native void clearAllPins(long chipClusterPtr, ClearAllPinsResponseCallback callback);
-
     private native void clearAllRfids(long chipClusterPtr, ClearAllRfidsResponseCallback callback);
-
-    private native void clearHolidaySchedule(
-        long chipClusterPtr, ClearHolidayScheduleResponseCallback callback, int scheduleId);
-
-    private native void clearPin(
-        long chipClusterPtr, ClearPinResponseCallback callback, int userId);
-
-    private native void clearRfid(
-        long chipClusterPtr, ClearRfidResponseCallback callback, int userId);
-
-    private native void clearWeekdaySchedule(
-        long chipClusterPtr,
-        ClearWeekdayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId);
-
-    private native void clearYeardaySchedule(
-        long chipClusterPtr,
-        ClearYeardayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId);
-
-    private native void getHolidaySchedule(
-        long chipClusterPtr, GetHolidayScheduleResponseCallback callback, int scheduleId);
-
-    private native void getLogRecord(
-        long chipClusterPtr, GetLogRecordResponseCallback callback, int logIndex);
-
+    private native void clearHolidaySchedule(long chipClusterPtr, ClearHolidayScheduleResponseCallback callback, int scheduleId);
+    private native void clearPin(long chipClusterPtr, ClearPinResponseCallback callback, int userId);
+    private native void clearRfid(long chipClusterPtr, ClearRfidResponseCallback callback, int userId);
+    private native void clearWeekdaySchedule(long chipClusterPtr, ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId);
+    private native void clearYeardaySchedule(long chipClusterPtr, ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId);
+    private native void getHolidaySchedule(long chipClusterPtr, GetHolidayScheduleResponseCallback callback, int scheduleId);
+    private native void getLogRecord(long chipClusterPtr, GetLogRecordResponseCallback callback, int logIndex);
     private native void getPin(long chipClusterPtr, GetPinResponseCallback callback, int userId);
-
     private native void getRfid(long chipClusterPtr, GetRfidResponseCallback callback, int userId);
-
-    private native void getUserType(
-        long chipClusterPtr, GetUserTypeResponseCallback callback, int userId);
-
-    private native void getWeekdaySchedule(
-        long chipClusterPtr,
-        GetWeekdayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId);
-
-    private native void getYeardaySchedule(
-        long chipClusterPtr,
-        GetYeardayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId);
-
-    private native void lockDoor(
-        long chipClusterPtr, LockDoorResponseCallback callback, byte[] pin);
-
-    private native void setHolidaySchedule(
-        long chipClusterPtr,
-        SetHolidayScheduleResponseCallback callback,
-        int scheduleId,
-        long localStartTime,
-        long localEndTime,
-        int operatingModeDuringHoliday);
-
-    private native void setPin(
-        long chipClusterPtr,
-        SetPinResponseCallback callback,
-        int userId,
-        int userStatus,
-        int userType,
-        byte[] pin);
-
-    private native void setRfid(
-        long chipClusterPtr,
-        SetRfidResponseCallback callback,
-        int userId,
-        int userStatus,
-        int userType,
-        byte[] id);
-
-    private native void setUserType(
-        long chipClusterPtr, SetUserTypeResponseCallback callback, int userId, int userType);
-
-    private native void setWeekdaySchedule(
-        long chipClusterPtr,
-        SetWeekdayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId,
-        int daysMask,
-        int startHour,
-        int startMinute,
-        int endHour,
-        int endMinute);
-
-    private native void setYeardaySchedule(
-        long chipClusterPtr,
-        SetYeardayScheduleResponseCallback callback,
-        int scheduleId,
-        int userId,
-        long localStartTime,
-        long localEndTime);
-
-    private native void unlockDoor(
-        long chipClusterPtr, UnlockDoorResponseCallback callback, byte[] pin);
-
-    private native void unlockWithTimeout(
-        long chipClusterPtr,
-        UnlockWithTimeoutResponseCallback callback,
-        int timeoutInSeconds,
-        byte[] pin);
-
+    private native void getUserType(long chipClusterPtr, GetUserTypeResponseCallback callback, int userId);
+    private native void getWeekdaySchedule(long chipClusterPtr, GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId);
+    private native void getYeardaySchedule(long chipClusterPtr, GetYeardayScheduleResponseCallback callback, int scheduleId, int userId);
+    private native void lockDoor(long chipClusterPtr, LockDoorResponseCallback callback, byte[] pin);
+    private native void setHolidaySchedule(long chipClusterPtr, SetHolidayScheduleResponseCallback callback, int scheduleId, long localStartTime, long localEndTime, int operatingModeDuringHoliday);
+    private native void setPin(long chipClusterPtr, SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin);
+    private native void setRfid(long chipClusterPtr, SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id);
+    private native void setUserType(long chipClusterPtr, SetUserTypeResponseCallback callback, int userId, int userType);
+    private native void setWeekdaySchedule(long chipClusterPtr, SetWeekdayScheduleResponseCallback callback, int scheduleId, int userId, int daysMask, int startHour, int startMinute, int endHour, int endMinute);
+    private native void setYeardaySchedule(long chipClusterPtr, SetYeardayScheduleResponseCallback callback, int scheduleId, int userId, long localStartTime, long localEndTime);
+    private native void unlockDoor(long chipClusterPtr, UnlockDoorResponseCallback callback, byte[] pin);
+    private native void unlockWithTimeout(long chipClusterPtr, UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin);
     public interface ClearAllPinsResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearAllRfidsResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearHolidayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearPinResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearRfidResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearWeekdayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface ClearYeardayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetHolidayScheduleResponseCallback {
       void onSuccess(
-          int scheduleId,
-          int status,
-          long localStartTime,
-          long localEndTime,
-          int operatingModeDuringHoliday);
-
+      int scheduleId
+      , int status
+      , long localStartTime
+      , long localEndTime
+      , int operatingModeDuringHoliday
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetLogRecordResponseCallback {
       void onSuccess(
-          int logEntryId,
-          long timestamp,
-          int eventType,
-          int source,
-          int eventIdOrAlarmCode,
-          int userId,
-          byte[] pin);
-
+      int logEntryId
+      , long timestamp
+      , int eventType
+      , int source
+      , int eventIdOrAlarmCode
+      , int userId
+      , byte[] pin
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetPinResponseCallback {
-      void onSuccess(int userId, int userStatus, int userType, byte[] pin);
-
+      void onSuccess(
+      int userId
+      , int userStatus
+      , int userType
+      , byte[] pin
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetRfidResponseCallback {
-      void onSuccess(int userId, int userStatus, int userType, byte[] rfid);
-
+      void onSuccess(
+      int userId
+      , int userStatus
+      , int userType
+      , byte[] rfid
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetUserTypeResponseCallback {
-      void onSuccess(int userId, int userType);
-
+      void onSuccess(
+      int userId
+      , int userType
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetWeekdayScheduleResponseCallback {
       void onSuccess(
-          int scheduleId,
-          int userId,
-          int status,
-          int daysMask,
-          int startHour,
-          int startMinute,
-          int endHour,
-          int endMinute);
-
+      int scheduleId
+      , int userId
+      , int status
+      , int daysMask
+      , int startHour
+      , int startMinute
+      , int endHour
+      , int endMinute
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetYeardayScheduleResponseCallback {
       void onSuccess(
-          int scheduleId, int userId, int status, long localStartTime, long localEndTime);
-
+      int scheduleId
+      , int userId
+      , int status
+      , long localStartTime
+      , long localEndTime
+      );
+      
       void onError(Exception error);
     }
 
     public interface LockDoorResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetHolidayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetPinResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetRfidResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetUserTypeResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetWeekdayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetYeardayScheduleResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface UnlockDoorResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
     public interface UnlockWithTimeoutResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
-    public void readLockStateAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readLockStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readLockStateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLockStateAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeLockStateAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -2720,35 +2641,43 @@ public void reportLockStateAttribute(IntegerAttributeCallback callback) {
       reportLockStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readLockTypeAttribute(IntegerAttributeCallback callback) {
+    public void readLockTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readLockTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readActuatorEnabledAttribute(BooleanAttributeCallback callback) {
+    public void readActuatorEnabledAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readActuatorEnabledAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readLockStateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readLockStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeLockStateAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportLockStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readLockTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readActuatorEnabledAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void subscribeLockStateAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportLockStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readLockTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readActuatorEnabledAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class ElectricalMeasurementCluster extends BaseChipCluster {
@@ -2763,89 +2692,126 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMeasurementTypeAttribute(LongAttributeCallback callback) {
+
+    public void readMeasurementTypeAttribute(
+      LongAttributeCallback callback
+    ) {
       readMeasurementTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readTotalActivePowerAttribute(LongAttributeCallback callback) {
+    public void readTotalActivePowerAttribute(
+      LongAttributeCallback callback
+    ) {
       readTotalActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageAttribute(IntegerAttributeCallback callback) {
+    public void readRmsVoltageAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageMinAttribute(IntegerAttributeCallback callback) {
+    public void readRmsVoltageMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsVoltageMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageMaxAttribute(IntegerAttributeCallback callback) {
+    public void readRmsVoltageMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsVoltageMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentAttribute(IntegerAttributeCallback callback) {
+    public void readRmsCurrentAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentMinAttribute(IntegerAttributeCallback callback) {
+    public void readRmsCurrentMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsCurrentMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentMaxAttribute(IntegerAttributeCallback callback) {
+    public void readRmsCurrentMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRmsCurrentMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerAttribute(IntegerAttributeCallback callback) {
+    public void readActivePowerAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerMinAttribute(IntegerAttributeCallback callback) {
+    public void readActivePowerMinAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readActivePowerMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerMaxAttribute(IntegerAttributeCallback callback) {
+    public void readActivePowerMaxAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readActivePowerMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readMeasurementTypeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTotalActivePowerAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRmsVoltageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRmsVoltageMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRmsVoltageMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRmsCurrentAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRmsCurrentMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRmsCurrentMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readActivePowerAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readActivePowerMinAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readActivePowerMaxAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readMeasurementTypeAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTotalActivePowerAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRmsVoltageAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRmsVoltageMinAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRmsVoltageMaxAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRmsCurrentAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRmsCurrentMinAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRmsCurrentMaxAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readActivePowerAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readActivePowerMinAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readActivePowerMaxAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -2866,75 +2832,106 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readPHYRateAttribute(IntegerAttributeCallback callback) {
+
+    public void readPHYRateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPHYRateAttribute(chipClusterPtr, callback);
     }
 
-    public void readFullDuplexAttribute(BooleanAttributeCallback callback) {
+    public void readFullDuplexAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readFullDuplexAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketRxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketRxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketTxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketTxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrCountAttribute(LongAttributeCallback callback) {
+    public void readTxErrCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxErrCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCollisionCountAttribute(LongAttributeCallback callback) {
+    public void readCollisionCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readCollisionCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+    public void readOverrunCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCarrierDetectAttribute(BooleanAttributeCallback callback) {
+    public void readCarrierDetectAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readCarrierDetectAttribute(chipClusterPtr, callback);
     }
 
-    public void readTimeSinceResetAttribute(LongAttributeCallback callback) {
+    public void readTimeSinceResetAttribute(
+      LongAttributeCallback callback
+    ) {
       readTimeSinceResetAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readPHYRateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readFullDuplexAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readPacketRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPacketTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxErrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readCollisionCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readCarrierDetectAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readTimeSinceResetAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readPHYRateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readFullDuplexAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readPacketRxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPacketTxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxErrCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readCollisionCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readCarrierDetectAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readTimeSinceResetAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class FixedLabelCluster extends BaseChipCluster {
@@ -2953,31 +2950,41 @@ public static class LabelListAttribute {
       public String label;
       public String value;
 
-      public LabelListAttribute(String label, String value) {
+      public LabelListAttribute(
+        String label,
+        String value
+      ) {
         this.label = label;
         this.value = value;
       }
     }
 
     public interface LabelListAttributeCallback {
-      void onSuccess(List<LabelListAttribute> valueList);
-
+      void onSuccess(List<
+      LabelListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readLabelListAttribute(LabelListAttributeCallback callback) {
+    public void readLabelListAttribute(
+      LabelListAttributeCallback callback
+    ) {
       readLabelListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readLabelListAttribute(
-        long chipClusterPtr, LabelListAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readLabelListAttribute(long chipClusterPtr,
+      LabelListAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class FlowMeasurementCluster extends BaseChipCluster {
@@ -2992,18 +2999,26 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
+
+    public void readMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMinMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMaxMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -3026,6 +3041,29 @@ private native void readToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+  
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 
   public static class GeneralCommissioningCluster extends BaseChipCluster {
@@ -3040,78 +3078,71 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void armFailSafe(
-        ArmFailSafeResponseCallback callback,
-        int expiryLengthSeconds,
-        long breadcrumb,
-        long timeoutMs) {
+    public void armFailSafe(ArmFailSafeResponseCallback callback, int expiryLengthSeconds, long breadcrumb, long timeoutMs) {
       armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timeoutMs);
     }
 
+
     public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
       commissioningComplete(chipClusterPtr, callback);
     }
 
-    public void setRegulatoryConfig(
-        SetRegulatoryConfigResponseCallback callback,
-        int location,
-        String countryCode,
-        long breadcrumb,
-        long timeoutMs) {
+
+    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, int location, String countryCode, long breadcrumb, long timeoutMs) {
       setRegulatoryConfig(chipClusterPtr, callback, location, countryCode, breadcrumb, timeoutMs);
     }
 
-    private native void armFailSafe(
-        long chipClusterPtr,
-        ArmFailSafeResponseCallback callback,
-        int expiryLengthSeconds,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void commissioningComplete(
-        long chipClusterPtr, CommissioningCompleteResponseCallback callback);
-
-    private native void setRegulatoryConfig(
-        long chipClusterPtr,
-        SetRegulatoryConfigResponseCallback callback,
-        int location,
-        String countryCode,
-        long breadcrumb,
-        long timeoutMs);
-
+    private native void armFailSafe(long chipClusterPtr, ArmFailSafeResponseCallback callback, int expiryLengthSeconds, long breadcrumb, long timeoutMs);
+    private native void commissioningComplete(long chipClusterPtr, CommissioningCompleteResponseCallback callback);
+    private native void setRegulatoryConfig(long chipClusterPtr, SetRegulatoryConfigResponseCallback callback, int location, String countryCode, long breadcrumb, long timeoutMs);
     public interface ArmFailSafeResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface CommissioningCompleteResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface SetRegulatoryConfigResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
+
     public static class BasicCommissioningInfoListAttribute {
       public long failSafeExpiryLengthMs;
-
-      public BasicCommissioningInfoListAttribute(long failSafeExpiryLengthMs) {
+      
+      public BasicCommissioningInfoListAttribute(
+        long failSafeExpiryLengthMs
+              ) {
         this.failSafeExpiryLengthMs = failSafeExpiryLengthMs;
       }
     }
 
     public interface BasicCommissioningInfoListAttributeCallback {
-      void onSuccess(List<BasicCommissioningInfoListAttribute> valueList);
-
+      void onSuccess(List<
+      BasicCommissioningInfoListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readBreadcrumbAttribute(LongAttributeCallback callback) {
+    public void readBreadcrumbAttribute(
+      LongAttributeCallback callback
+    ) {
       readBreadcrumbAttribute(chipClusterPtr, callback);
     }
 
@@ -3120,25 +3151,30 @@ public void writeBreadcrumbAttribute(DefaultClusterCallback callback, long value
     }
 
     public void readBasicCommissioningInfoListAttribute(
-        BasicCommissioningInfoListAttributeCallback callback) {
+      BasicCommissioningInfoListAttributeCallback callback
+    ) {
       readBasicCommissioningInfoListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readBreadcrumbAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void readBreadcrumbAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void writeBreadcrumbAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, long value);
-
-    private native void readBasicCommissioningInfoListAttribute(
-        long chipClusterPtr, BasicCommissioningInfoListAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeBreadcrumbAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readBasicCommissioningInfoListAttribute(long chipClusterPtr,
+      BasicCommissioningInfoListAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class GeneralDiagnosticsCluster extends BaseChipCluster {
@@ -3156,18 +3192,19 @@ public static long clusterId() {
     public static class NetworkInterfacesAttribute {
       public String name;
       public boolean fabricConnected;
-      public boolean offPremiseServicesReachableIPv4;
-      public boolean offPremiseServicesReachableIPv6;
-      public byte[] hardwareAddress;
+            public boolean offPremiseServicesReachableIPv4;
+            public boolean offPremiseServicesReachableIPv6;
+            public byte[] hardwareAddress;
       public int type;
-
+      
       public NetworkInterfacesAttribute(
-          String name,
-          boolean fabricConnected,
-          boolean offPremiseServicesReachableIPv4,
-          boolean offPremiseServicesReachableIPv6,
-          byte[] hardwareAddress,
-          int type) {
+        String name,
+        boolean fabricConnected,
+                boolean offPremiseServicesReachableIPv4,
+                boolean offPremiseServicesReachableIPv6,
+                byte[] hardwareAddress,
+        int type
+              ) {
         this.name = name;
         this.fabricConnected = fabricConnected;
         this.offPremiseServicesReachableIPv4 = offPremiseServicesReachableIPv4;
@@ -3178,51 +3215,71 @@ public NetworkInterfacesAttribute(
     }
 
     public interface NetworkInterfacesAttributeCallback {
-      void onSuccess(List<NetworkInterfacesAttribute> valueList);
-
+      void onSuccess(List<
+      NetworkInterfacesAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readNetworkInterfacesAttribute(NetworkInterfacesAttributeCallback callback) {
+    public void readNetworkInterfacesAttribute(
+      NetworkInterfacesAttributeCallback callback
+    ) {
       readNetworkInterfacesAttribute(chipClusterPtr, callback);
     }
 
-    public void readRebootCountAttribute(IntegerAttributeCallback callback) {
+    public void readRebootCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRebootCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readUpTimeAttribute(LongAttributeCallback callback) {
+    public void readUpTimeAttribute(
+      LongAttributeCallback callback
+    ) {
       readUpTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readTotalOperationalHoursAttribute(LongAttributeCallback callback) {
+    public void readTotalOperationalHoursAttribute(
+      LongAttributeCallback callback
+    ) {
       readTotalOperationalHoursAttribute(chipClusterPtr, callback);
     }
 
-    public void readBootReasonsAttribute(IntegerAttributeCallback callback) {
+    public void readBootReasonsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBootReasonsAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readNetworkInterfacesAttribute(
-        long chipClusterPtr, NetworkInterfacesAttributeCallback callback);
-
-    private native void readRebootCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTotalOperationalHoursAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readBootReasonsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readNetworkInterfacesAttribute(long chipClusterPtr,
+      NetworkInterfacesAttributeCallback callback
+    );
+  
+    private native void readRebootCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readUpTimeAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTotalOperationalHoursAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readBootReasonsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class GroupKeyManagementCluster extends BaseChipCluster {
@@ -3239,10 +3296,14 @@ public static long clusterId() {
 
     public static class GroupsAttribute {
       public int vendorId;
-      public int vendorGroupId;
-      public int groupKeySetIndex;
-
-      public GroupsAttribute(int vendorId, int vendorGroupId, int groupKeySetIndex) {
+            public int vendorGroupId;
+            public int groupKeySetIndex;
+      
+      public GroupsAttribute(
+        int vendorId,
+                int vendorGroupId,
+                int groupKeySetIndex
+              ) {
         this.vendorId = vendorId;
         this.vendorGroupId = vendorGroupId;
         this.groupKeySetIndex = groupKeySetIndex;
@@ -3250,24 +3311,25 @@ public GroupsAttribute(int vendorId, int vendorGroupId, int groupKeySetIndex) {
     }
 
     public interface GroupsAttributeCallback {
-      void onSuccess(List<GroupsAttribute> valueList);
-
+      void onSuccess(List<
+      GroupsAttribute
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class GroupKeysAttribute {
       public int vendorId;
-      public int groupKeyIndex;
-      public byte[] groupKeyRoot;
+            public int groupKeyIndex;
+            public byte[] groupKeyRoot;
       public long groupKeyEpochStartTime;
-      public int groupKeySecurityPolicy;
-
+            public int groupKeySecurityPolicy;
+      
       public GroupKeysAttribute(
-          int vendorId,
-          int groupKeyIndex,
-          byte[] groupKeyRoot,
-          long groupKeyEpochStartTime,
-          int groupKeySecurityPolicy) {
+        int vendorId,
+                int groupKeyIndex,
+                byte[] groupKeyRoot,
+        long groupKeyEpochStartTime,
+                int groupKeySecurityPolicy
+              ) {
         this.vendorId = vendorId;
         this.groupKeyIndex = groupKeyIndex;
         this.groupKeyRoot = groupKeyRoot;
@@ -3277,30 +3339,41 @@ public GroupKeysAttribute(
     }
 
     public interface GroupKeysAttributeCallback {
-      void onSuccess(List<GroupKeysAttribute> valueList);
-
+      void onSuccess(List<
+      GroupKeysAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readGroupsAttribute(GroupsAttributeCallback callback) {
+    public void readGroupsAttribute(
+      GroupsAttributeCallback callback
+    ) {
       readGroupsAttribute(chipClusterPtr, callback);
     }
 
-    public void readGroupKeysAttribute(GroupKeysAttributeCallback callback) {
+    public void readGroupKeysAttribute(
+      GroupKeysAttributeCallback callback
+    ) {
       readGroupKeysAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readGroupsAttribute(long chipClusterPtr, GroupsAttributeCallback callback);
-
-    private native void readGroupKeysAttribute(
-        long chipClusterPtr, GroupKeysAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readGroupsAttribute(long chipClusterPtr,
+      GroupsAttributeCallback callback
+    );
+  
+    private native void readGroupKeysAttribute(long chipClusterPtr,
+      GroupKeysAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class GroupsCluster extends BaseChipCluster {
@@ -3319,88 +3392,97 @@ public void addGroup(AddGroupResponseCallback callback, int groupId, String grou
       addGroup(chipClusterPtr, callback, groupId, groupName);
     }
 
-    public void addGroupIfIdentifying(
-        DefaultClusterCallback callback, int groupId, String groupName) {
+
+    public void addGroupIfIdentifying(DefaultClusterCallback callback, int groupId, String groupName) {
       addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName);
     }
 
-    public void getGroupMembership(
-        GetGroupMembershipResponseCallback callback, int groupCount, int groupList) {
+
+    public void getGroupMembership(GetGroupMembershipResponseCallback callback, int groupCount, int groupList) {
       getGroupMembership(chipClusterPtr, callback, groupCount, groupList);
     }
 
+
     public void removeAllGroups(DefaultClusterCallback callback) {
       removeAllGroups(chipClusterPtr, callback);
     }
 
+
     public void removeGroup(RemoveGroupResponseCallback callback, int groupId) {
       removeGroup(chipClusterPtr, callback, groupId);
     }
 
+
     public void viewGroup(ViewGroupResponseCallback callback, int groupId) {
       viewGroup(chipClusterPtr, callback, groupId);
     }
 
-    private native void addGroup(
-        long chipClusterPtr, AddGroupResponseCallback callback, int groupId, String groupName);
-
-    private native void addGroupIfIdentifying(
-        long chipClusterPtr, DefaultClusterCallback callback, int groupId, String groupName);
-
-    private native void getGroupMembership(
-        long chipClusterPtr,
-        GetGroupMembershipResponseCallback callback,
-        int groupCount,
-        int groupList);
-
+    private native void addGroup(long chipClusterPtr, AddGroupResponseCallback callback, int groupId, String groupName);
+    private native void addGroupIfIdentifying(long chipClusterPtr, DefaultClusterCallback callback, int groupId, String groupName);
+    private native void getGroupMembership(long chipClusterPtr, GetGroupMembershipResponseCallback callback, int groupCount, int groupList);
     private native void removeAllGroups(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void removeGroup(
-        long chipClusterPtr, RemoveGroupResponseCallback callback, int groupId);
-
-    private native void viewGroup(
-        long chipClusterPtr, ViewGroupResponseCallback callback, int groupId);
-
+    private native void removeGroup(long chipClusterPtr, RemoveGroupResponseCallback callback, int groupId);
+    private native void viewGroup(long chipClusterPtr, ViewGroupResponseCallback callback, int groupId);
     public interface AddGroupResponseCallback {
-      void onSuccess(int status, int groupId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetGroupMembershipResponseCallback {
-      void onSuccess(int capacity, int groupCount
-          // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          );
-
+      void onSuccess(
+      int capacity
+      , int groupCount
+      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      );
+      
       void onError(Exception error);
     }
 
     public interface RemoveGroupResponseCallback {
-      void onSuccess(int status, int groupId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      );
+      
       void onError(Exception error);
     }
 
     public interface ViewGroupResponseCallback {
-      void onSuccess(int status, int groupId, String groupName);
-
+      void onSuccess(
+      int status
+      , int groupId
+      , String groupName
+      );
+      
       void onError(Exception error);
     }
 
-    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readNameSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readNameSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readNameSupportAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class IdentifyCluster extends BaseChipCluster {
@@ -3419,33 +3501,32 @@ public void identify(DefaultClusterCallback callback, int identifyTime) {
       identify(chipClusterPtr, callback, identifyTime);
     }
 
+
     public void identifyQuery(IdentifyQueryResponseCallback callback) {
       identifyQuery(chipClusterPtr, callback);
     }
 
-    public void triggerEffect(
-        DefaultClusterCallback callback, int effectIdentifier, int effectVariant) {
+
+    public void triggerEffect(DefaultClusterCallback callback, int effectIdentifier, int effectVariant) {
       triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant);
     }
 
-    private native void identify(
-        long chipClusterPtr, DefaultClusterCallback callback, int identifyTime);
-
+    private native void identify(long chipClusterPtr, DefaultClusterCallback callback, int identifyTime);
     private native void identifyQuery(long chipClusterPtr, IdentifyQueryResponseCallback callback);
-
-    private native void triggerEffect(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int effectIdentifier,
-        int effectVariant);
-
+    private native void triggerEffect(long chipClusterPtr, DefaultClusterCallback callback, int effectIdentifier, int effectVariant);
     public interface IdentifyQueryResponseCallback {
-      void onSuccess(int timeout);
-
+      void onSuccess(
+      int timeout
+      );
+      
       void onError(Exception error);
     }
 
-    public void readIdentifyTimeAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readIdentifyTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readIdentifyTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3453,25 +3534,31 @@ public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, int valu
       writeIdentifyTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readIdentifyTypeAttribute(IntegerAttributeCallback callback) {
+    public void readIdentifyTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readIdentifyTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readIdentifyTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readIdentifyTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeIdentifyTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readIdentifyTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeIdentifyTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readIdentifyTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class IlluminanceMeasurementCluster extends BaseChipCluster {
@@ -3561,19 +3648,25 @@ public void sendKey(SendKeyResponseCallback callback, int keyCode) {
     }
 
     private native void sendKey(long chipClusterPtr, SendKeyResponseCallback callback, int keyCode);
-
     public interface SendKeyResponseCallback {
-      void onSuccess(int status);
-
+      void onSuccess(
+      int status
+      );
+      
       void onError(Exception error);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class LevelControlCluster extends BaseChipCluster {
@@ -3588,106 +3681,62 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void move(
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionMask,
-        int optionOverride) {
+    public void move(DefaultClusterCallback callback, int moveMode, int rate, int optionMask, int optionOverride) {
       move(chipClusterPtr, callback, moveMode, rate, optionMask, optionOverride);
     }
 
-    public void moveToLevel(
-        DefaultClusterCallback callback,
-        int level,
-        int transitionTime,
-        int optionMask,
-        int optionOverride) {
+
+    public void moveToLevel(DefaultClusterCallback callback, int level, int transitionTime, int optionMask, int optionOverride) {
       moveToLevel(chipClusterPtr, callback, level, transitionTime, optionMask, optionOverride);
     }
 
-    public void moveToLevelWithOnOff(
-        DefaultClusterCallback callback, int level, int transitionTime) {
+
+    public void moveToLevelWithOnOff(DefaultClusterCallback callback, int level, int transitionTime) {
       moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime);
     }
 
+
     public void moveWithOnOff(DefaultClusterCallback callback, int moveMode, int rate) {
       moveWithOnOff(chipClusterPtr, callback, moveMode, rate);
     }
 
-    public void step(
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionMask,
-        int optionOverride) {
-      step(
-          chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+
+    public void step(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionMask, int optionOverride) {
+      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionMask, optionOverride);
     }
 
-    public void stepWithOnOff(
-        DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime) {
+
+    public void stepWithOnOff(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime) {
       stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime);
     }
 
+
     public void stop(DefaultClusterCallback callback, int optionMask, int optionOverride) {
       stop(chipClusterPtr, callback, optionMask, optionOverride);
     }
 
+
     public void stopWithOnOff(DefaultClusterCallback callback) {
       stopWithOnOff(chipClusterPtr, callback);
     }
 
-    private native void move(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int moveMode,
-        int rate,
-        int optionMask,
-        int optionOverride);
-
-    private native void moveToLevel(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int level,
-        int transitionTime,
-        int optionMask,
-        int optionOverride);
-
-    private native void moveToLevelWithOnOff(
-        long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime);
-
-    private native void moveWithOnOff(
-        long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate);
-
-    private native void step(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime,
-        int optionMask,
-        int optionOverride);
-
-    private native void stepWithOnOff(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int stepMode,
-        int stepSize,
-        int transitionTime);
-
-    private native void stop(
-        long chipClusterPtr, DefaultClusterCallback callback, int optionMask, int optionOverride);
-
+    private native void move(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionMask, int optionOverride);
+    private native void moveToLevel(long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime, int optionMask, int optionOverride);
+    private native void moveToLevelWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime);
+    private native void moveWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate);
+    private native void step(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionMask, int optionOverride);
+    private native void stepWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime);
+    private native void stop(long chipClusterPtr, DefaultClusterCallback callback, int optionMask, int optionOverride);
     private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readCurrentLevelAttribute(IntegerAttributeCallback callback) {
+
+    public void readCurrentLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentLevelAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentLevelAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -3695,33 +3744,45 @@ public void reportCurrentLevelAttribute(IntegerAttributeCallback callback) {
       reportCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
+    public void readRemainingTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinLevelAttribute(IntegerAttributeCallback callback) {
+    public void readMinLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxLevelAttribute(IntegerAttributeCallback callback) {
+    public void readMaxLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentFrequencyAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinFrequencyAttribute(IntegerAttributeCallback callback) {
+    public void readMinFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxFrequencyAttribute(IntegerAttributeCallback callback) {
+    public void readMaxFrequencyAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readOptionsAttribute(IntegerAttributeCallback callback) {
+    public void readOptionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOptionsAttribute(chipClusterPtr, callback);
     }
 
@@ -3729,7 +3790,9 @@ public void writeOptionsAttribute(DefaultClusterCallback callback, int value) {
       writeOptionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
+    public void readOnOffTransitionTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3737,7 +3800,9 @@ public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, i
       writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnLevelAttribute(IntegerAttributeCallback callback) {
+    public void readOnLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOnLevelAttribute(chipClusterPtr, callback);
     }
 
@@ -3745,7 +3810,9 @@ public void writeOnLevelAttribute(DefaultClusterCallback callback, int value) {
       writeOnLevelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnTransitionTimeAttribute(IntegerAttributeCallback callback) {
+    public void readOnTransitionTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOnTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3753,7 +3820,9 @@ public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, int
       writeOnTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
+    public void readOffTransitionTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3761,7 +3830,9 @@ public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, int
       writeOffTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readDefaultMoveRateAttribute(IntegerAttributeCallback callback) {
+    public void readDefaultMoveRateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readDefaultMoveRateAttribute(chipClusterPtr, callback);
     }
 
@@ -3769,7 +3840,9 @@ public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, int v
       writeDefaultMoveRateAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartUpCurrentLevelAttribute(IntegerAttributeCallback callback) {
+    public void readStartUpCurrentLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
@@ -3777,105 +3850,89 @@ public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, i
       writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-=======
     public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readCurrentLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCurrentLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-    private native void subscribeCurrentLevelAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportCurrentLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-<<<<<<< HEAD
-    private native void readRemainingTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCurrentFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxFrequencyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readOptionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOptionsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readOnOffTransitionTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnOffTransitionTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readOnLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnLevelAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readOnTransitionTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnTransitionTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void reportCurrentLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readRemainingTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentFrequencyAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinFrequencyAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxFrequencyAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readOptionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readOffTransitionTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOnOffTransitionTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeOffTransitionTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeOnOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOnLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readDefaultMoveRateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeOnLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOnTransitionTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeDefaultMoveRateAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeOnTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOffTransitionTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readStartUpCurrentLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readDefaultMoveRateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeStartUpCurrentLevelAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeDefaultMoveRateAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readStartUpCurrentLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    private native void reportCurrentLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeStartUpCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
   
     private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
   }
 
   public static class LowPowerCluster extends BaseChipCluster {
@@ -3896,12 +3953,16 @@ public void sleep(DefaultClusterCallback callback) {
 
     private native void sleep(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class MediaInputCluster extends BaseChipCluster {
@@ -3920,35 +3981,38 @@ public void hideInputStatus(DefaultClusterCallback callback) {
       hideInputStatus(chipClusterPtr, callback);
     }
 
+
     public void renameInput(DefaultClusterCallback callback, int index, String name) {
       renameInput(chipClusterPtr, callback, index, name);
     }
 
+
     public void selectInput(DefaultClusterCallback callback, int index) {
       selectInput(chipClusterPtr, callback, index);
     }
 
+
     public void showInputStatus(DefaultClusterCallback callback) {
       showInputStatus(chipClusterPtr, callback);
     }
 
     private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void renameInput(
-        long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
-
-    private native void selectInput(
-        long chipClusterPtr, DefaultClusterCallback callback, int index);
-
+    private native void renameInput(long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
+    private native void selectInput(long chipClusterPtr, DefaultClusterCallback callback, int index);
     private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback callback);
 
     public static class MediaInputListAttribute {
       public int index;
-      public int inputType;
-      public String name;
+            public int inputType;
+            public String name;
       public String description;
 
-      public MediaInputListAttribute(int index, int inputType, String name, String description) {
+      public MediaInputListAttribute(
+        int index,
+                int inputType,
+                String name,
+        String description
+      ) {
         this.index = index;
         this.inputType = inputType;
         this.name = name;
@@ -3957,31 +4021,41 @@ public MediaInputListAttribute(int index, int inputType, String name, String des
     }
 
     public interface MediaInputListAttributeCallback {
-      void onSuccess(List<MediaInputListAttribute> valueList);
-
+      void onSuccess(List<
+      MediaInputListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readMediaInputListAttribute(MediaInputListAttributeCallback callback) {
+    public void readMediaInputListAttribute(
+      MediaInputListAttributeCallback callback
+    ) {
       readMediaInputListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentMediaInputAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentMediaInputAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentMediaInputAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readMediaInputListAttribute(
-        long chipClusterPtr, MediaInputListAttributeCallback callback);
-
-    private native void readCurrentMediaInputAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readMediaInputListAttribute(long chipClusterPtr,
+      MediaInputListAttributeCallback callback
+    );
+  
+    private native void readCurrentMediaInputAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class MediaPlaybackCluster extends BaseChipCluster {
@@ -4000,204 +4074,246 @@ public void mediaFastForward(MediaFastForwardResponseCallback callback) {
       mediaFastForward(chipClusterPtr, callback);
     }
 
+
     public void mediaNext(MediaNextResponseCallback callback) {
       mediaNext(chipClusterPtr, callback);
     }
 
+
     public void mediaPause(MediaPauseResponseCallback callback) {
       mediaPause(chipClusterPtr, callback);
     }
 
+
     public void mediaPlay(MediaPlayResponseCallback callback) {
       mediaPlay(chipClusterPtr, callback);
     }
 
+
     public void mediaPrevious(MediaPreviousResponseCallback callback) {
       mediaPrevious(chipClusterPtr, callback);
     }
 
+
     public void mediaRewind(MediaRewindResponseCallback callback) {
       mediaRewind(chipClusterPtr, callback);
     }
 
+
     public void mediaSeek(MediaSeekResponseCallback callback, long position) {
       mediaSeek(chipClusterPtr, callback, position);
     }
 
-    public void mediaSkipBackward(
-        MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds) {
+
+    public void mediaSkipBackward(MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds) {
       mediaSkipBackward(chipClusterPtr, callback, deltaPositionMilliseconds);
     }
 
-    public void mediaSkipForward(
-        MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds) {
+
+    public void mediaSkipForward(MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds) {
       mediaSkipForward(chipClusterPtr, callback, deltaPositionMilliseconds);
     }
 
+
     public void mediaStartOver(MediaStartOverResponseCallback callback) {
       mediaStartOver(chipClusterPtr, callback);
     }
 
+
     public void mediaStop(MediaStopResponseCallback callback) {
       mediaStop(chipClusterPtr, callback);
     }
 
-    private native void mediaFastForward(
-        long chipClusterPtr, MediaFastForwardResponseCallback callback);
-
+    private native void mediaFastForward(long chipClusterPtr, MediaFastForwardResponseCallback callback);
     private native void mediaNext(long chipClusterPtr, MediaNextResponseCallback callback);
-
     private native void mediaPause(long chipClusterPtr, MediaPauseResponseCallback callback);
-
     private native void mediaPlay(long chipClusterPtr, MediaPlayResponseCallback callback);
-
     private native void mediaPrevious(long chipClusterPtr, MediaPreviousResponseCallback callback);
-
     private native void mediaRewind(long chipClusterPtr, MediaRewindResponseCallback callback);
-
-    private native void mediaSeek(
-        long chipClusterPtr, MediaSeekResponseCallback callback, long position);
-
-    private native void mediaSkipBackward(
-        long chipClusterPtr,
-        MediaSkipBackwardResponseCallback callback,
-        long deltaPositionMilliseconds);
-
-    private native void mediaSkipForward(
-        long chipClusterPtr,
-        MediaSkipForwardResponseCallback callback,
-        long deltaPositionMilliseconds);
-
-    private native void mediaStartOver(
-        long chipClusterPtr, MediaStartOverResponseCallback callback);
-
+    private native void mediaSeek(long chipClusterPtr, MediaSeekResponseCallback callback, long position);
+    private native void mediaSkipBackward(long chipClusterPtr, MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds);
+    private native void mediaSkipForward(long chipClusterPtr, MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds);
+    private native void mediaStartOver(long chipClusterPtr, MediaStartOverResponseCallback callback);
     private native void mediaStop(long chipClusterPtr, MediaStopResponseCallback callback);
-
     public interface MediaFastForwardResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaNextResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaPauseResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaPlayResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaPreviousResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaRewindResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaSeekResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaSkipBackwardResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaSkipForwardResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaStartOverResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
     public interface MediaStopResponseCallback {
-      void onSuccess(int mediaPlaybackStatus);
-
+      void onSuccess(
+      int mediaPlaybackStatus
+      );
+      
       void onError(Exception error);
     }
 
-    public void readPlaybackStateAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readPlaybackStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPlaybackStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readStartTimeAttribute(LongAttributeCallback callback) {
+    public void readStartTimeAttribute(
+      LongAttributeCallback callback
+    ) {
       readStartTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readDurationAttribute(LongAttributeCallback callback) {
+    public void readDurationAttribute(
+      LongAttributeCallback callback
+    ) {
       readDurationAttribute(chipClusterPtr, callback);
     }
 
-    public void readPositionUpdatedAtAttribute(LongAttributeCallback callback) {
+    public void readPositionUpdatedAtAttribute(
+      LongAttributeCallback callback
+    ) {
       readPositionUpdatedAtAttribute(chipClusterPtr, callback);
     }
 
-    public void readPositionAttribute(LongAttributeCallback callback) {
+    public void readPositionAttribute(
+      LongAttributeCallback callback
+    ) {
       readPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readPlaybackSpeedAttribute(LongAttributeCallback callback) {
+    public void readPlaybackSpeedAttribute(
+      LongAttributeCallback callback
+    ) {
       readPlaybackSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readSeekRangeEndAttribute(LongAttributeCallback callback) {
+    public void readSeekRangeEndAttribute(
+      LongAttributeCallback callback
+    ) {
       readSeekRangeEndAttribute(chipClusterPtr, callback);
     }
 
-    public void readSeekRangeStartAttribute(LongAttributeCallback callback) {
+    public void readSeekRangeStartAttribute(
+      LongAttributeCallback callback
+    ) {
       readSeekRangeStartAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readPlaybackStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readStartTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPositionUpdatedAtAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPositionAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPlaybackSpeedAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readSeekRangeEndAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readSeekRangeStartAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readPlaybackStateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readStartTimeAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readDurationAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPositionUpdatedAtAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPositionAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPlaybackSpeedAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readSeekRangeEndAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readSeekRangeStartAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class NetworkCommissioningCluster extends BaseChipCluster {
@@ -4212,194 +4328,156 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addThreadNetwork(
-        AddThreadNetworkResponseCallback callback,
-        byte[] operationalDataset,
-        long breadcrumb,
-        long timeoutMs) {
+    public void addThreadNetwork(AddThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs) {
       addThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timeoutMs);
     }
 
-    public void addWiFiNetwork(
-        AddWiFiNetworkResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        long breadcrumb,
-        long timeoutMs) {
+
+    public void addWiFiNetwork(AddWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs) {
       addWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timeoutMs);
     }
 
-    public void disableNetwork(
-        DisableNetworkResponseCallback callback,
-        byte[] networkID,
-        long breadcrumb,
-        long timeoutMs) {
+
+    public void disableNetwork(DisableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
       disableNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
-    public void enableNetwork(
-        EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
+
+    public void enableNetwork(EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
       enableNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
+
     public void getLastNetworkCommissioningResult(DefaultClusterCallback callback, long timeoutMs) {
       getLastNetworkCommissioningResult(chipClusterPtr, callback, timeoutMs);
     }
 
-    public void removeNetwork(
-        RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
+
+    public void removeNetwork(RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
       removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
-    public void scanNetworks(
-        ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs) {
+
+    public void scanNetworks(ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs) {
       scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timeoutMs);
     }
 
-    public void updateThreadNetwork(
-        UpdateThreadNetworkResponseCallback callback,
-        byte[] operationalDataset,
-        long breadcrumb,
-        long timeoutMs) {
+
+    public void updateThreadNetwork(UpdateThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs) {
       updateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timeoutMs);
     }
 
-    public void updateWiFiNetwork(
-        UpdateWiFiNetworkResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        long breadcrumb,
-        long timeoutMs) {
+
+    public void updateWiFiNetwork(UpdateWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs) {
       updateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timeoutMs);
     }
 
-    private native void addThreadNetwork(
-        long chipClusterPtr,
-        AddThreadNetworkResponseCallback callback,
-        byte[] operationalDataset,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void addWiFiNetwork(
-        long chipClusterPtr,
-        AddWiFiNetworkResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void disableNetwork(
-        long chipClusterPtr,
-        DisableNetworkResponseCallback callback,
-        byte[] networkID,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void enableNetwork(
-        long chipClusterPtr,
-        EnableNetworkResponseCallback callback,
-        byte[] networkID,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void getLastNetworkCommissioningResult(
-        long chipClusterPtr, DefaultClusterCallback callback, long timeoutMs);
-
-    private native void removeNetwork(
-        long chipClusterPtr,
-        RemoveNetworkResponseCallback callback,
-        byte[] networkID,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void scanNetworks(
-        long chipClusterPtr,
-        ScanNetworksResponseCallback callback,
-        byte[] ssid,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void updateThreadNetwork(
-        long chipClusterPtr,
-        UpdateThreadNetworkResponseCallback callback,
-        byte[] operationalDataset,
-        long breadcrumb,
-        long timeoutMs);
-
-    private native void updateWiFiNetwork(
-        long chipClusterPtr,
-        UpdateWiFiNetworkResponseCallback callback,
-        byte[] ssid,
-        byte[] credentials,
-        long breadcrumb,
-        long timeoutMs);
-
+    private native void addThreadNetwork(long chipClusterPtr, AddThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs);
+    private native void addWiFiNetwork(long chipClusterPtr, AddWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs);
+    private native void disableNetwork(long chipClusterPtr, DisableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
+    private native void enableNetwork(long chipClusterPtr, EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
+    private native void getLastNetworkCommissioningResult(long chipClusterPtr, DefaultClusterCallback callback, long timeoutMs);
+    private native void removeNetwork(long chipClusterPtr, RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
+    private native void scanNetworks(long chipClusterPtr, ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs);
+    private native void updateThreadNetwork(long chipClusterPtr, UpdateThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs);
+    private native void updateWiFiNetwork(long chipClusterPtr, UpdateWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs);
     public interface AddThreadNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface AddWiFiNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface DisableNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface EnableNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface RemoveNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface ScanNetworksResponseCallback {
-      void onSuccess(int errorCode, String debugText
-          // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          );
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      );
+      
       void onError(Exception error);
     }
 
     public interface UpdateThreadNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface UpdateWiFiNetworkResponseCallback {
-      void onSuccess(int errorCode, String debugText);
-
+      void onSuccess(
+      int errorCode
+      , String debugText
+      );
+      
       void onError(Exception error);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+
+
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
@@ -4414,89 +4492,58 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void applyUpdateRequest(
-        ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion) {
+    public void applyUpdateRequest(ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion) {
       applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion);
     }
 
-    public void notifyUpdateApplied(
-        DefaultClusterCallback callback, byte[] updateToken, long softwareVersion) {
-      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion);
-    }
 
-    public void queryImage(
-        QueryImageResponseCallback callback,
-        int vendorId,
-        int productId,
-        int hardwareVersion,
-        long softwareVersion,
-        int protocolsSupported,
-        String location,
-        boolean requestorCanConsent,
-        byte[] metadataForProvider) {
-      queryImage(
-          chipClusterPtr,
-          callback,
-          vendorId,
-          productId,
-          hardwareVersion,
-          softwareVersion,
-          protocolsSupported,
-          location,
-          requestorCanConsent,
-          metadataForProvider);
+    public void notifyUpdateApplied(DefaultClusterCallback callback, byte[] updateToken, long softwareVersion) {
+      notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion);
     }
 
-    private native void applyUpdateRequest(
-        long chipClusterPtr,
-        ApplyUpdateRequestResponseCallback callback,
-        byte[] updateToken,
-        long newVersion);
-
-    private native void notifyUpdateApplied(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        byte[] updateToken,
-        long softwareVersion);
 
-    private native void queryImage(
-        long chipClusterPtr,
-        QueryImageResponseCallback callback,
-        int vendorId,
-        int productId,
-        int hardwareVersion,
-        long softwareVersion,
-        int protocolsSupported,
-        String location,
-        boolean requestorCanConsent,
-        byte[] metadataForProvider);
+    public void queryImage(QueryImageResponseCallback callback, int vendorId, int productId, int hardwareVersion, long softwareVersion, int protocolsSupported, String location, boolean requestorCanConsent, byte[] metadataForProvider) {
+      queryImage(chipClusterPtr, callback, vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, location, requestorCanConsent, metadataForProvider);
+    }
 
+    private native void applyUpdateRequest(long chipClusterPtr, ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion);
+    private native void notifyUpdateApplied(long chipClusterPtr, DefaultClusterCallback callback, byte[] updateToken, long softwareVersion);
+    private native void queryImage(long chipClusterPtr, QueryImageResponseCallback callback, int vendorId, int productId, int hardwareVersion, long softwareVersion, int protocolsSupported, String location, boolean requestorCanConsent, byte[] metadataForProvider);
     public interface ApplyUpdateRequestResponseCallback {
-      void onSuccess(int action, long delayedActionTime);
-
+      void onSuccess(
+      int action
+      , long delayedActionTime
+      );
+      
       void onError(Exception error);
     }
 
     public interface QueryImageResponseCallback {
       void onSuccess(
-          int status,
-          long delayedActionTime,
-          String imageURI,
-          long softwareVersion,
-          String softwareVersionString,
-          byte[] updateToken,
-          boolean userConsentNeeded,
-          byte[] metadataForRequestor);
-
+      int status
+      , long delayedActionTime
+      , String imageURI
+      , long softwareVersion
+      , String softwareVersionString
+      , byte[] updateToken
+      , boolean userConsentNeeded
+      , byte[] metadataForRequestor
+      );
+      
       void onError(Exception error);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
@@ -4511,6 +4558,7 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+<<<<<<< HEAD
     public void announceOtaProvider(
         DefaultClusterCallback callback,
         long providerLocation,
@@ -4533,8 +4581,18 @@ private native void announceOtaProvider(
         int vendorId,
         int announcementReason,
         byte[] metadataForNode);
+=======
+    public void announceOtaProvider(DefaultClusterCallback callback, byte[] providerLocation, int vendorId, int announcementReason, byte[] metadataForNode) {
+      announceOtaProvider(chipClusterPtr, callback, providerLocation, vendorId, announcementReason, metadataForNode);
+    }
+
+    private native void announceOtaProvider(long chipClusterPtr, DefaultClusterCallback callback, byte[] providerLocation, int vendorId, int announcementReason, byte[] metadataForNode);
+>>>>>>> e83b94d19 (need to wait for cast-helper)
+
 
-    public void readDefaultOtaProviderAttribute(OctetStringAttributeCallback callback) {
+    public void readDefaultOtaProviderAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readDefaultOtaProviderAttribute(chipClusterPtr, callback);
     }
 
@@ -4542,25 +4600,31 @@ public void writeDefaultOtaProviderAttribute(DefaultClusterCallback callback, by
       writeDefaultOtaProviderAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readUpdatePossibleAttribute(BooleanAttributeCallback callback) {
+    public void readUpdatePossibleAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readUpdatePossibleAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readDefaultOtaProviderAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
 
-    private native void readDefaultOtaProviderAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void writeDefaultOtaProviderAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
-
-    private native void readUpdatePossibleAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeDefaultOtaProviderAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
+  
+    private native void readUpdatePossibleAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OccupancySensingCluster extends BaseChipCluster {
@@ -4575,12 +4639,14 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readOccupancyAttribute(IntegerAttributeCallback callback) {
+
+    public void readOccupancyAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOccupancyAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOccupancyAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOccupancyAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -4588,35 +4654,43 @@ public void reportOccupancyAttribute(IntegerAttributeCallback callback) {
       reportOccupancyAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupancySensorTypeAttribute(IntegerAttributeCallback callback) {
+    public void readOccupancySensorTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOccupancySensorTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupancySensorTypeBitmapAttribute(IntegerAttributeCallback callback) {
+    public void readOccupancySensorTypeBitmapAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readOccupancyAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readOccupancyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeOccupancyAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportOccupancyAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readOccupancySensorTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readOccupancySensorTypeBitmapAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeOccupancyAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readOccupancySensorTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readOccupancySensorTypeBitmapAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OnOffCluster extends BaseChipCluster {
@@ -4635,52 +4709,46 @@ public void off(DefaultClusterCallback callback) {
       off(chipClusterPtr, callback);
     }
 
+
     public void offWithEffect(DefaultClusterCallback callback, int effectId, int effectVariant) {
       offWithEffect(chipClusterPtr, callback, effectId, effectVariant);
     }
 
+
     public void on(DefaultClusterCallback callback) {
       on(chipClusterPtr, callback);
     }
 
+
     public void onWithRecallGlobalScene(DefaultClusterCallback callback) {
       onWithRecallGlobalScene(chipClusterPtr, callback);
     }
 
-    public void onWithTimedOff(
-        DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime) {
+
+    public void onWithTimedOff(DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime) {
       onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime);
     }
 
+
     public void toggle(DefaultClusterCallback callback) {
       toggle(chipClusterPtr, callback);
     }
 
     private native void off(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void offWithEffect(
-        long chipClusterPtr, DefaultClusterCallback callback, int effectId, int effectVariant);
-
+    private native void offWithEffect(long chipClusterPtr, DefaultClusterCallback callback, int effectId, int effectVariant);
     private native void on(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void onWithRecallGlobalScene(
-        long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void onWithTimedOff(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int onOffControl,
-        int onTime,
-        int offWaitTime);
-
+    private native void onWithRecallGlobalScene(long chipClusterPtr, DefaultClusterCallback callback);
+    private native void onWithTimedOff(long chipClusterPtr, DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime);
     private native void toggle(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readOnOffAttribute(BooleanAttributeCallback callback) {
+
+    public void readOnOffAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readOnOffAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOnOffAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOnOffAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -4688,11 +4756,15 @@ public void reportOnOffAttribute(BooleanAttributeCallback callback) {
       reportOnOffAttribute(chipClusterPtr, callback);
     }
 
-    public void readGlobalSceneControlAttribute(BooleanAttributeCallback callback) {
+    public void readGlobalSceneControlAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readGlobalSceneControlAttribute(chipClusterPtr, callback);
     }
 
-    public void readOnTimeAttribute(IntegerAttributeCallback callback) {
+    public void readOnTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOnTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -4700,7 +4772,9 @@ public void writeOnTimeAttribute(DefaultClusterCallback callback, int value) {
       writeOnTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOffWaitTimeAttribute(IntegerAttributeCallback callback) {
+    public void readOffWaitTimeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOffWaitTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -4708,7 +4782,9 @@ public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, int value
       writeOffWaitTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartUpOnOffAttribute(IntegerAttributeCallback callback) {
+    public void readStartUpOnOffAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStartUpOnOffAttribute(chipClusterPtr, callback);
     }
 
@@ -4716,47 +4792,55 @@ public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, int valu
       writeStartUpOnOffAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readOnOffAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void readOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void subscribeOnOffAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportOnOffAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readGlobalSceneControlAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOnTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readOffWaitTimeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOffWaitTimeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void subscribeOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readStartUpOnOffAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
+  
+    private native void readGlobalSceneControlAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readOnTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeStartUpOnOffAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeOnTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOffWaitTimeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeOffWaitTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readStartUpOnOffAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeStartUpOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
@@ -4771,11 +4855,16 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readSwitchTypeAttribute(IntegerAttributeCallback callback) {
+
+    public void readSwitchTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSwitchTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readSwitchActionsAttribute(IntegerAttributeCallback callback) {
+    public void readSwitchActionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSwitchActionsAttribute(chipClusterPtr, callback);
     }
 
@@ -4783,21 +4872,25 @@ public void writeSwitchActionsAttribute(DefaultClusterCallback callback, int val
       writeSwitchActionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readSwitchTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readSwitchActionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readSwitchTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readSwitchActionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeSwitchActionsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeSwitchActionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class OperationalCredentialsCluster extends BaseChipCluster {
@@ -4812,122 +4905,112 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addNOC(
-        NOCResponseCallback callback,
-        byte[] NOCValue,
-        byte[] ICACValue,
-        byte[] IPKValue,
-        long caseAdminNode,
-        int adminVendorId) {
+    public void addNOC(NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue, byte[] IPKValue, long caseAdminNode, int adminVendorId) {
       addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminNode, adminVendorId);
     }
 
+
     public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCertificate) {
       addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate);
     }
 
+
     public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce) {
       attestationRequest(chipClusterPtr, callback, attestationNonce);
     }
 
-    public void certificateChainRequest(
-        CertificateChainResponseCallback callback, int certificateType) {
+
+    public void certificateChainRequest(CertificateChainResponseCallback callback, int certificateType) {
       certificateChainRequest(chipClusterPtr, callback, certificateType);
     }
 
+
     public void opCSRRequest(OpCSRResponseCallback callback, byte[] CSRNonce) {
       opCSRRequest(chipClusterPtr, callback, CSRNonce);
     }
 
+
     public void removeFabric(NOCResponseCallback callback, int fabricIndex) {
       removeFabric(chipClusterPtr, callback, fabricIndex);
     }
 
-    public void removeTrustedRootCertificate(
-        DefaultClusterCallback callback, byte[] trustedRootIdentifier) {
+
+    public void removeTrustedRootCertificate(DefaultClusterCallback callback, byte[] trustedRootIdentifier) {
       removeTrustedRootCertificate(chipClusterPtr, callback, trustedRootIdentifier);
     }
 
+
     public void updateFabricLabel(NOCResponseCallback callback, String label) {
       updateFabricLabel(chipClusterPtr, callback, label);
     }
 
+
     public void updateNOC(NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue) {
       updateNOC(chipClusterPtr, callback, NOCValue, ICACValue);
     }
 
-    private native void addNOC(
-        long chipClusterPtr,
-        NOCResponseCallback callback,
-        byte[] NOCValue,
-        byte[] ICACValue,
-        byte[] IPKValue,
-        long caseAdminNode,
-        int adminVendorId);
-
-    private native void addTrustedRootCertificate(
-        long chipClusterPtr, DefaultClusterCallback callback, byte[] rootCertificate);
-
-    private native void attestationRequest(
-        long chipClusterPtr, AttestationResponseCallback callback, byte[] attestationNonce);
-
-    private native void certificateChainRequest(
-        long chipClusterPtr, CertificateChainResponseCallback callback, int certificateType);
-
-    private native void opCSRRequest(
-        long chipClusterPtr, OpCSRResponseCallback callback, byte[] CSRNonce);
-
-    private native void removeFabric(
-        long chipClusterPtr, NOCResponseCallback callback, int fabricIndex);
-
-    private native void removeTrustedRootCertificate(
-        long chipClusterPtr, DefaultClusterCallback callback, byte[] trustedRootIdentifier);
-
-    private native void updateFabricLabel(
-        long chipClusterPtr, NOCResponseCallback callback, String label);
-
-    private native void updateNOC(
-        long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue);
-
+    private native void addNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue, byte[] IPKValue, long caseAdminNode, int adminVendorId);
+    private native void addTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback callback, byte[] rootCertificate);
+    private native void attestationRequest(long chipClusterPtr, AttestationResponseCallback callback, byte[] attestationNonce);
+    private native void certificateChainRequest(long chipClusterPtr, CertificateChainResponseCallback callback, int certificateType);
+    private native void opCSRRequest(long chipClusterPtr, OpCSRResponseCallback callback, byte[] CSRNonce);
+    private native void removeFabric(long chipClusterPtr, NOCResponseCallback callback, int fabricIndex);
+    private native void removeTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback callback, byte[] trustedRootIdentifier);
+    private native void updateFabricLabel(long chipClusterPtr, NOCResponseCallback callback, String label);
+    private native void updateNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue);
     public interface AttestationResponseCallback {
-      void onSuccess(byte[] AttestationElements, byte[] Signature);
-
+      void onSuccess(
+      byte[] AttestationElements
+      , byte[] Signature
+      );
+      
       void onError(Exception error);
     }
 
     public interface CertificateChainResponseCallback {
-      void onSuccess(byte[] Certificate);
-
+      void onSuccess(
+      byte[] Certificate
+      );
+      
       void onError(Exception error);
     }
 
     public interface NOCResponseCallback {
-      void onSuccess(int StatusCode, int FabricIndex, String DebugText);
-
+      void onSuccess(
+      int StatusCode
+      , int FabricIndex
+      , String DebugText
+      );
+      
       void onError(Exception error);
     }
 
     public interface OpCSRResponseCallback {
-      void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature);
-
+      void onSuccess(
+      byte[] NOCSRElements
+      , byte[] AttestationSignature
+      );
+      
       void onError(Exception error);
     }
 
+
     public static class FabricsListAttribute {
       public int fabricIndex;
-      public byte[] rootPublicKey;
+            public byte[] rootPublicKey;
       public int vendorId;
-      public long fabricId;
-      public long nodeId;
-      public String label;
+            public long fabricId;
+            public long nodeId;
+            public String label;
 
       public FabricsListAttribute(
-          int fabricIndex,
-          byte[] rootPublicKey,
-          int vendorId,
-          long fabricId,
-          long nodeId,
-          String label) {
+        int fabricIndex,
+                byte[] rootPublicKey,
+        int vendorId,
+                long fabricId,
+                long nodeId,
+                String label
+      ) {
         this.fabricIndex = fabricIndex;
         this.rootPublicKey = rootPublicKey;
         this.vendorId = vendorId;
@@ -4938,11 +5021,13 @@ public FabricsListAttribute(
     }
 
     public interface FabricsListAttributeCallback {
-      void onSuccess(List<FabricsListAttribute> valueList);
-
+      void onSuccess(List<
+      FabricsListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
+<<<<<<< HEAD
     public interface TrustedRootCertificatesAttributeCallback {
       void onSuccess(List<byte[]> valueList);
 
@@ -4950,17 +5035,27 @@ public interface TrustedRootCertificatesAttributeCallback {
     }
 
     public void readFabricsListAttribute(FabricsListAttributeCallback callback) {
+=======
+    public void readFabricsListAttribute(
+      FabricsListAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readFabricsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readSupportedFabricsAttribute(IntegerAttributeCallback callback) {
+    public void readSupportedFabricsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSupportedFabricsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCommissionedFabricsAttribute(IntegerAttributeCallback callback) {
+    public void readCommissionedFabricsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCommissionedFabricsAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readTrustedRootCertificatesAttribute(
         TrustedRootCertificatesAttributeCallback callback) {
       readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
@@ -4991,9 +5086,32 @@ private native void readCurrentFabricIndexAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-  }
-
-  public static class PowerSourceCluster extends BaseChipCluster {
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+  
+    private native void readFabricsListAttribute(long chipClusterPtr,
+      FabricsListAttributeCallback callback
+    );
+  
+    private native void readSupportedFabricsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCommissionedFabricsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
+  }
+
+  public static class PowerSourceCluster extends BaseChipCluster {
     public PowerSourceCluster(long devicePtr, int endpointId) {
       super(devicePtr, endpointId);
     }
@@ -5005,86 +5123,123 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public interface ActiveBatteryFaultsAttributeCallback {
-      void onSuccess(List<Integer> valueList);
 
+    public interface ActiveBatteryFaultsAttributeCallback {
+      void onSuccess(List<
+        Integer
+              > valueList);
       void onError(Exception ex);
     }
 
-    public void readStatusAttribute(IntegerAttributeCallback callback) {
+    public void readStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readOrderAttribute(IntegerAttributeCallback callback) {
+    public void readOrderAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOrderAttribute(chipClusterPtr, callback);
     }
 
-    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
+    public void readDescriptionAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readDescriptionAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryVoltageAttribute(LongAttributeCallback callback) {
+    public void readBatteryVoltageAttribute(
+      LongAttributeCallback callback
+    ) {
       readBatteryVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryPercentRemainingAttribute(IntegerAttributeCallback callback) {
+    public void readBatteryPercentRemainingAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBatteryPercentRemainingAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryTimeRemainingAttribute(LongAttributeCallback callback) {
+    public void readBatteryTimeRemainingAttribute(
+      LongAttributeCallback callback
+    ) {
       readBatteryTimeRemainingAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryChargeLevelAttribute(IntegerAttributeCallback callback) {
+    public void readBatteryChargeLevelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBatteryChargeLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readActiveBatteryFaultsAttribute(ActiveBatteryFaultsAttributeCallback callback) {
+    public void readActiveBatteryFaultsAttribute(
+      ActiveBatteryFaultsAttributeCallback callback
+    ) {
       readActiveBatteryFaultsAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryChargeStateAttribute(IntegerAttributeCallback callback) {
+    public void readBatteryChargeStateAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBatteryChargeStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readDescriptionAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readBatteryVoltageAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readBatteryPercentRemainingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBatteryTimeRemainingAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readBatteryChargeLevelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readActiveBatteryFaultsAttribute(
-        long chipClusterPtr, ActiveBatteryFaultsAttributeCallback callback);
-
-    private native void readBatteryChargeStateAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readOrderAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readDescriptionAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readBatteryVoltageAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readBatteryPercentRemainingAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBatteryTimeRemainingAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readBatteryChargeLevelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readActiveBatteryFaultsAttribute(long chipClusterPtr,
+      ActiveBatteryFaultsAttributeCallback callback
+    );
+  
+    private native void readBatteryChargeStateAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class PressureMeasurementCluster extends BaseChipCluster {
@@ -5099,12 +5254,14 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
+
+    public void readMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5112,35 +5269,43 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMinMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMaxMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeMeasuredValueAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
@@ -5155,64 +5320,92 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMaxPressureAttribute(IntegerAttributeCallback callback) {
+
+    public void readMaxPressureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxSpeedAttribute(IntegerAttributeCallback callback) {
+    public void readMaxSpeedAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxFlowAttribute(IntegerAttributeCallback callback) {
+    public void readMaxFlowAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstPressureAttribute(IntegerAttributeCallback callback) {
+    public void readMinConstPressureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstPressureAttribute(IntegerAttributeCallback callback) {
+    public void readMaxConstPressureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinCompPressureAttribute(IntegerAttributeCallback callback) {
+    public void readMinCompPressureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxCompPressureAttribute(IntegerAttributeCallback callback) {
+    public void readMaxCompPressureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstSpeedAttribute(IntegerAttributeCallback callback) {
+    public void readMinConstSpeedAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinConstSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstSpeedAttribute(IntegerAttributeCallback callback) {
+    public void readMaxConstSpeedAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxConstSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstFlowAttribute(IntegerAttributeCallback callback) {
+    public void readMinConstFlowAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinConstFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstFlowAttribute(IntegerAttributeCallback callback) {
+    public void readMaxConstFlowAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxConstFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstTempAttribute(IntegerAttributeCallback callback) {
+    public void readMinConstTempAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinConstTempAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstTempAttribute(IntegerAttributeCallback callback) {
+    public void readMaxConstTempAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxConstTempAttribute(chipClusterPtr, callback);
     }
 
-    public void readPumpStatusAttribute(IntegerAttributeCallback callback) {
+    public void readPumpStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPumpStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePumpStatusAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribePumpStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5220,20 +5413,25 @@ public void reportPumpStatusAttribute(IntegerAttributeCallback callback) {
       reportPumpStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readEffectiveOperationModeAttribute(IntegerAttributeCallback callback) {
+    public void readEffectiveOperationModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readEffectiveOperationModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readEffectiveControlModeAttribute(IntegerAttributeCallback callback) {
+    public void readEffectiveControlModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readEffectiveControlModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCapacityAttribute(IntegerAttributeCallback callback) {
+    public void readCapacityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCapacityAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCapacityAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCapacityAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5241,15 +5439,21 @@ public void reportCapacityAttribute(IntegerAttributeCallback callback) {
       reportCapacityAttribute(chipClusterPtr, callback);
     }
 
-    public void readSpeedAttribute(IntegerAttributeCallback callback) {
+    public void readSpeedAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readLifetimeEnergyConsumedAttribute(LongAttributeCallback callback) {
+    public void readLifetimeEnergyConsumedAttribute(
+      LongAttributeCallback callback
+    ) {
       readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
     }
 
-    public void readOperationModeAttribute(IntegerAttributeCallback callback) {
+    public void readOperationModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOperationModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5257,7 +5461,9 @@ public void writeOperationModeAttribute(DefaultClusterCallback callback, int val
       writeOperationModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readControlModeAttribute(IntegerAttributeCallback callback) {
+    public void readControlModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readControlModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5265,106 +5471,131 @@ public void writeControlModeAttribute(DefaultClusterCallback callback, int value
       writeControlModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readAlarmMaskAttribute(IntegerAttributeCallback callback) {
+    public void readAlarmMaskAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAlarmMaskAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readMaxPressureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxSpeedAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxFlowAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinConstPressureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxConstPressureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinCompPressureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxCompPressureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinConstSpeedAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxConstSpeedAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinConstFlowAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxConstFlowAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMinConstTempAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxConstTempAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPumpStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMaxPressureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxSpeedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribePumpStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxFlowAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportPumpStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readEffectiveOperationModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readEffectiveControlModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCapacityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMinConstPressureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCapacityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readMaxConstPressureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readSpeedAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readLifetimeEnergyConsumedAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readOperationModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMinCompPressureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxCompPressureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinConstSpeedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxConstSpeedAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinConstFlowAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxConstFlowAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinConstTempAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxConstTempAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readPumpStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribePumpStatusAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportPumpStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readEffectiveOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readEffectiveControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCapacityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCapacityAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportCapacityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readSpeedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readLifetimeEnergyConsumedAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readOperationModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeOperationModeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readControlModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeControlModeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readAlarmMaskAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readFeatureMapAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readControlModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeControlModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readAlarmMaskAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
@@ -5379,12 +5610,14 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
+
+    public void readMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5392,14 +5625,19 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMinMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMaxMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -5414,12 +5652,21 @@ public void reportToleranceAttribute(IntegerAttributeCallback callback) {
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
+<<<<<<< HEAD
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -5443,6 +5690,21 @@ private native void reportToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 
   public static class ScenesCluster extends BaseChipCluster {
@@ -5457,168 +5719,174 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addScene(
-        AddSceneResponseCallback callback,
-        int groupId,
-        int sceneId,
-        int transitionTime,
-        String sceneName,
-        long clusterId,
-        int length,
-        int value) {
-      addScene(
-          chipClusterPtr,
-          callback,
-          groupId,
-          sceneId,
-          transitionTime,
-          sceneName,
-          clusterId,
-          length,
-          value);
+    public void addScene(AddSceneResponseCallback callback, int groupId, int sceneId, int transitionTime, String sceneName, long clusterId, int length, int value) {
+      addScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, sceneName, clusterId, length, value);
     }
 
+
     public void getSceneMembership(GetSceneMembershipResponseCallback callback, int groupId) {
       getSceneMembership(chipClusterPtr, callback, groupId);
     }
 
-    public void recallScene(
-        DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime) {
+
+    public void recallScene(DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime) {
       recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime);
     }
 
+
     public void removeAllScenes(RemoveAllScenesResponseCallback callback, int groupId) {
       removeAllScenes(chipClusterPtr, callback, groupId);
     }
 
+
     public void removeScene(RemoveSceneResponseCallback callback, int groupId, int sceneId) {
       removeScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
+
     public void storeScene(StoreSceneResponseCallback callback, int groupId, int sceneId) {
       storeScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
+
     public void viewScene(ViewSceneResponseCallback callback, int groupId, int sceneId) {
       viewScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
-    private native void addScene(
-        long chipClusterPtr,
-        AddSceneResponseCallback callback,
-        int groupId,
-        int sceneId,
-        int transitionTime,
-        String sceneName,
-        long clusterId,
-        int length,
-        int value);
-
-    private native void getSceneMembership(
-        long chipClusterPtr, GetSceneMembershipResponseCallback callback, int groupId);
-
-    private native void recallScene(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int groupId,
-        int sceneId,
-        int transitionTime);
-
-    private native void removeAllScenes(
-        long chipClusterPtr, RemoveAllScenesResponseCallback callback, int groupId);
-
-    private native void removeScene(
-        long chipClusterPtr, RemoveSceneResponseCallback callback, int groupId, int sceneId);
-
-    private native void storeScene(
-        long chipClusterPtr, StoreSceneResponseCallback callback, int groupId, int sceneId);
-
-    private native void viewScene(
-        long chipClusterPtr, ViewSceneResponseCallback callback, int groupId, int sceneId);
-
+    private native void addScene(long chipClusterPtr, AddSceneResponseCallback callback, int groupId, int sceneId, int transitionTime, String sceneName, long clusterId, int length, int value);
+    private native void getSceneMembership(long chipClusterPtr, GetSceneMembershipResponseCallback callback, int groupId);
+    private native void recallScene(long chipClusterPtr, DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime);
+    private native void removeAllScenes(long chipClusterPtr, RemoveAllScenesResponseCallback callback, int groupId);
+    private native void removeScene(long chipClusterPtr, RemoveSceneResponseCallback callback, int groupId, int sceneId);
+    private native void storeScene(long chipClusterPtr, StoreSceneResponseCallback callback, int groupId, int sceneId);
+    private native void viewScene(long chipClusterPtr, ViewSceneResponseCallback callback, int groupId, int sceneId);
     public interface AddSceneResponseCallback {
-      void onSuccess(int status, int groupId, int sceneId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      , int sceneId
+      );
+      
       void onError(Exception error);
     }
 
     public interface GetSceneMembershipResponseCallback {
-      void onSuccess(int status, int capacity, int groupId, int sceneCount
-          // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          );
-
+      void onSuccess(
+      int status
+      , int capacity
+      , int groupId
+      , int sceneCount
+      // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      );
+      
       void onError(Exception error);
     }
 
     public interface RemoveAllScenesResponseCallback {
-      void onSuccess(int status, int groupId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      );
+      
       void onError(Exception error);
     }
 
     public interface RemoveSceneResponseCallback {
-      void onSuccess(int status, int groupId, int sceneId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      , int sceneId
+      );
+      
       void onError(Exception error);
     }
 
     public interface StoreSceneResponseCallback {
-      void onSuccess(int status, int groupId, int sceneId);
-
+      void onSuccess(
+      int status
+      , int groupId
+      , int sceneId
+      );
+      
       void onError(Exception error);
     }
 
     public interface ViewSceneResponseCallback {
-      void onSuccess(int status, int groupId, int sceneId, int transitionTime, String sceneName
-          // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          );
-
+      void onSuccess(
+      int status
+      , int groupId
+      , int sceneId
+      , int transitionTime
+      , String sceneName
+      // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      );
+      
       void onError(Exception error);
     }
 
-    public void readSceneCountAttribute(IntegerAttributeCallback callback) {
+
+
+    public void readSceneCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSceneCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentSceneAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentSceneAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentSceneAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentGroupAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentGroupAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentGroupAttribute(chipClusterPtr, callback);
     }
 
-    public void readSceneValidAttribute(BooleanAttributeCallback callback) {
+    public void readSceneValidAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readSceneValidAttribute(chipClusterPtr, callback);
     }
 
-    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
+    public void readNameSupportAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readSceneCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCurrentSceneAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCurrentGroupAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readSceneValidAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
-
-    private native void readNameSupportAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readSceneCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentSceneAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentGroupAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readSceneValidAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
+  
+    private native void readNameSupportAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
@@ -5639,33 +5907,46 @@ public void resetWatermarks(DefaultClusterCallback callback) {
 
     private native void resetWatermarks(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readCurrentHeapFreeAttribute(LongAttributeCallback callback) {
+
+    public void readCurrentHeapFreeAttribute(
+      LongAttributeCallback callback
+    ) {
       readCurrentHeapFreeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentHeapUsedAttribute(LongAttributeCallback callback) {
+    public void readCurrentHeapUsedAttribute(
+      LongAttributeCallback callback
+    ) {
       readCurrentHeapUsedAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentHeapHighWatermarkAttribute(LongAttributeCallback callback) {
+    public void readCurrentHeapHighWatermarkAttribute(
+      LongAttributeCallback callback
+    ) {
       readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readCurrentHeapFreeAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readCurrentHeapUsedAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readCurrentHeapHighWatermarkAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readCurrentHeapFreeAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readCurrentHeapUsedAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readCurrentHeapHighWatermarkAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class SwitchCluster extends BaseChipCluster {
@@ -5680,16 +5961,20 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readNumberOfPositionsAttribute(IntegerAttributeCallback callback) {
+
+    public void readNumberOfPositionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNumberOfPositionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentPositionAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5697,24 +5982,27 @@ public void reportCurrentPositionAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readNumberOfPositionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentPositionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readNumberOfPositionsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCurrentPositionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void subscribeCurrentPositionAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportCurrentPositionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentPositionAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class TvChannelCluster extends BaseChipCluster {
@@ -5733,46 +6021,44 @@ public void changeChannel(ChangeChannelResponseCallback callback, String match)
       changeChannel(chipClusterPtr, callback, match);
     }
 
-    public void changeChannelByNumber(
-        DefaultClusterCallback callback, int majorNumber, int minorNumber) {
+
+    public void changeChannelByNumber(DefaultClusterCallback callback, int majorNumber, int minorNumber) {
       changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber);
     }
 
+
     public void skipChannel(DefaultClusterCallback callback, int count) {
       skipChannel(chipClusterPtr, callback, count);
     }
 
-    private native void changeChannel(
-        long chipClusterPtr, ChangeChannelResponseCallback callback, String match);
-
-    private native void changeChannelByNumber(
-        long chipClusterPtr, DefaultClusterCallback callback, int majorNumber, int minorNumber);
-
-    private native void skipChannel(
-        long chipClusterPtr, DefaultClusterCallback callback, int count);
-
+    private native void changeChannel(long chipClusterPtr, ChangeChannelResponseCallback callback, String match);
+    private native void changeChannelByNumber(long chipClusterPtr, DefaultClusterCallback callback, int majorNumber, int minorNumber);
+    private native void skipChannel(long chipClusterPtr, DefaultClusterCallback callback, int count);
     public interface ChangeChannelResponseCallback {
       void onSuccess(
-          // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          int ErrorType);
-
+      // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      int ErrorType
+      );
+      
       void onError(Exception error);
     }
 
+
     public static class TvChannelListAttribute {
       public int majorNumber;
-      public int minorNumber;
-      public String name;
+            public int minorNumber;
+            public String name;
       public String callSign;
       public String affiliateCallSign;
 
       public TvChannelListAttribute(
-          int majorNumber,
-          int minorNumber,
-          String name,
-          String callSign,
-          String affiliateCallSign) {
+        int majorNumber,
+                int minorNumber,
+                String name,
+        String callSign,
+        String affiliateCallSign
+      ) {
         this.majorNumber = majorNumber;
         this.minorNumber = minorNumber;
         this.name = name;
@@ -5782,44 +6068,57 @@ public TvChannelListAttribute(
     }
 
     public interface TvChannelListAttributeCallback {
-      void onSuccess(List<TvChannelListAttribute> valueList);
-
+      void onSuccess(List<
+      TvChannelListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readTvChannelListAttribute(TvChannelListAttributeCallback callback) {
+    public void readTvChannelListAttribute(
+      TvChannelListAttributeCallback callback
+    ) {
       readTvChannelListAttribute(chipClusterPtr, callback);
     }
 
-    public void readTvChannelLineupAttribute(OctetStringAttributeCallback callback) {
+    public void readTvChannelLineupAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readTvChannelLineupAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentTvChannelAttribute(OctetStringAttributeCallback callback) {
+    public void readCurrentTvChannelAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readCurrentTvChannelAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readTvChannelListAttribute(long chipClusterPtr,
+      TvChannelListAttributeCallback callback
+    );
+  
+    private native void readTvChannelLineupAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readCurrentTvChannelAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  }
 
-    private native void readTvChannelListAttribute(
-        long chipClusterPtr, TvChannelListAttributeCallback callback);
-
-    private native void readTvChannelLineupAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readCurrentTvChannelAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-  }
-
-  public static class TargetNavigatorCluster extends BaseChipCluster {
-    public TargetNavigatorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+  public static class TargetNavigatorCluster extends BaseChipCluster {
+    public TargetNavigatorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
     public static long clusterId() {
       return Long.parseUnsignedLong("1285");
@@ -5832,44 +6131,56 @@ public void navigateTarget(NavigateTargetResponseCallback callback, int target,
       navigateTarget(chipClusterPtr, callback, target, data);
     }
 
-    private native void navigateTarget(
-        long chipClusterPtr, NavigateTargetResponseCallback callback, int target, String data);
-
+    private native void navigateTarget(long chipClusterPtr, NavigateTargetResponseCallback callback, int target, String data);
     public interface NavigateTargetResponseCallback {
-      void onSuccess(int status, String data);
-
+      void onSuccess(
+      int status
+      , String data
+      );
+      
       void onError(Exception error);
     }
 
+
     public static class TargetNavigatorListAttribute {
       public int identifier;
-      public String name;
+            public String name;
 
-      public TargetNavigatorListAttribute(int identifier, String name) {
+      public TargetNavigatorListAttribute(
+        int identifier,
+                String name
+      ) {
         this.identifier = identifier;
         this.name = name;
       }
     }
 
     public interface TargetNavigatorListAttributeCallback {
-      void onSuccess(List<TargetNavigatorListAttribute> valueList);
-
+      void onSuccess(List<
+      TargetNavigatorListAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readTargetNavigatorListAttribute(TargetNavigatorListAttributeCallback callback) {
+    public void readTargetNavigatorListAttribute(
+      TargetNavigatorListAttributeCallback callback
+    ) {
       readTargetNavigatorListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readTargetNavigatorListAttribute(
-        long chipClusterPtr, TargetNavigatorListAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readTargetNavigatorListAttribute(long chipClusterPtr,
+      TargetNavigatorListAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class TemperatureMeasurementCluster extends BaseChipCluster {
@@ -5884,12 +6195,14 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
+
+    public void readMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5897,14 +6210,19 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMinMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
+    public void readMaxMeasuredValueAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -5919,12 +6237,21 @@ public void reportToleranceAttribute(IntegerAttributeCallback callback) {
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
+<<<<<<< HEAD
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -5948,6 +6275,21 @@ private native void reportToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 
   public static class TestClusterCluster extends BaseChipCluster {
@@ -5966,10 +6308,12 @@ public void test(DefaultClusterCallback callback) {
       test(chipClusterPtr, callback);
     }
 
+
     public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1, int arg2) {
       testAddArguments(chipClusterPtr, callback, arg1, arg2);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
@@ -5979,48 +6323,46 @@ public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int a
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
+=======
+
+>>>>>>> e83b94d19 (need to wait for cast-helper)
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
 
-    public void testListInt8UReverseRequest(
-        TestListInt8UReverseResponseCallback callback, int arg1) {
+
+    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, int arg1) {
       testListInt8UReverseRequest(chipClusterPtr, callback, arg1);
     }
 
-    public void testListStructArgumentRequest(
-        DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
+
+    public void testListStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
       testListStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
-=======
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+
     public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void testNullableOptionalRequest(
         TestNullableOptionalResponseCallback callback, int arg1) {
       testNullableOptionalRequest(chipClusterPtr, callback, arg1);
     }
+=======
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 
     public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public void testStructArgumentRequest(
-        DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
+
+    public void testStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
       testStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
-=======
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+
     public void testUnknownCommand(DefaultClusterCallback callback) {
       testUnknownCommand(chipClusterPtr, callback);
     }
@@ -6028,6 +6370,7 @@ public void testUnknownCommand(DefaultClusterCallback callback) {
     private native void test(long chipClusterPtr, DefaultClusterCallback callback);
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
@@ -6058,39 +6401,28 @@ private native void testListStructArgumentRequest(
         int f);
 
 =======
-    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 =======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
+    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
+    private native void testListInt8UArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int arg1);
+    private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
+    private native void testListStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
     private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
+<<<<<<< HEAD
 
     private native void testNullableOptionalRequest(
         long chipClusterPtr, TestNullableOptionalResponseCallback callback, int arg1);
 
-    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-    private native void testStructArgumentRequest(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int a,
-        boolean b,
-        int c,
-        byte[] d,
-        String e,
-        int f);
-
 =======
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+>>>>>>> e83b94d19 (need to wait for cast-helper)
+    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
+    private native void testStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
     private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
-
     public interface TestAddArgumentsResponseCallback {
-      void onSuccess(int returnValue);
-
+      void onSuccess(
+      int returnValue
+      );
+      
       void onError(Exception error);
     }
 
@@ -6102,10 +6434,10 @@ public interface TestEnumsResponseCallback {
 
     public interface TestListInt8UReverseResponseCallback {
       void onSuccess(
-          // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
-          // Conversion from this type to Java is not properly implemented yet
-          );
-
+      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
+      // Conversion from this type to Java is not properly implemented yet
+      );
+      
       void onError(Exception error);
     }
 
@@ -6116,40 +6448,51 @@ public interface TestNullableOptionalResponseCallback {
     }
 
     public interface TestSpecificResponseCallback {
-      void onSuccess(int returnValue);
-
+      void onSuccess(
+      int returnValue
+      );
+      
       void onError(Exception error);
     }
 
-    public interface ListInt8uAttributeCallback {
-      void onSuccess(List<Integer> valueList);
 
+
+    public interface ListInt8uAttributeCallback {
+      void onSuccess(List<
+        Integer
+              > valueList);
       void onError(Exception ex);
     }
 
     public interface ListOctetStringAttributeCallback {
-      void onSuccess(List<byte[]> valueList);
-
+      void onSuccess(List<
+        byte[]
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class ListStructOctetStringAttribute {
       public long fabricIndex;
-      public byte[] operationalCert;
+            public byte[] operationalCert;
 
-      public ListStructOctetStringAttribute(long fabricIndex, byte[] operationalCert) {
+      public ListStructOctetStringAttribute(
+        long fabricIndex,
+                byte[] operationalCert
+      ) {
         this.fabricIndex = fabricIndex;
         this.operationalCert = operationalCert;
       }
     }
 
     public interface ListStructOctetStringAttributeCallback {
-      void onSuccess(List<ListStructOctetStringAttribute> valueList);
-
+      void onSuccess(List<
+      ListStructOctetStringAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
-    public void readBooleanAttribute(BooleanAttributeCallback callback) {
+    public void readBooleanAttribute(
+      BooleanAttributeCallback callback
+    ) {
       readBooleanAttribute(chipClusterPtr, callback);
     }
 
@@ -6157,7 +6500,9 @@ public void writeBooleanAttribute(DefaultClusterCallback callback, boolean value
       writeBooleanAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap8Attribute(IntegerAttributeCallback callback) {
+    public void readBitmap8Attribute(
+      IntegerAttributeCallback callback
+    ) {
       readBitmap8Attribute(chipClusterPtr, callback);
     }
 
@@ -6165,7 +6510,9 @@ public void writeBitmap8Attribute(DefaultClusterCallback callback, int value) {
       writeBitmap8Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap16Attribute(IntegerAttributeCallback callback) {
+    public void readBitmap16Attribute(
+      IntegerAttributeCallback callback
+    ) {
       readBitmap16Attribute(chipClusterPtr, callback);
     }
 
@@ -6173,7 +6520,9 @@ public void writeBitmap16Attribute(DefaultClusterCallback callback, int value) {
       writeBitmap16Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap32Attribute(LongAttributeCallback callback) {
+    public void readBitmap32Attribute(
+      LongAttributeCallback callback
+    ) {
       readBitmap32Attribute(chipClusterPtr, callback);
     }
 
@@ -6181,7 +6530,9 @@ public void writeBitmap32Attribute(DefaultClusterCallback callback, long value)
       writeBitmap32Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap64Attribute(LongAttributeCallback callback) {
+    public void readBitmap64Attribute(
+      LongAttributeCallback callback
+    ) {
       readBitmap64Attribute(chipClusterPtr, callback);
     }
 
@@ -6189,7 +6540,9 @@ public void writeBitmap64Attribute(DefaultClusterCallback callback, long value)
       writeBitmap64Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt8uAttribute(IntegerAttributeCallback callback) {
+    public void readInt8uAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInt8uAttribute(chipClusterPtr, callback);
     }
 
@@ -6197,7 +6550,9 @@ public void writeInt8uAttribute(DefaultClusterCallback callback, int value) {
       writeInt8uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt16uAttribute(IntegerAttributeCallback callback) {
+    public void readInt16uAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInt16uAttribute(chipClusterPtr, callback);
     }
 
@@ -6205,7 +6560,9 @@ public void writeInt16uAttribute(DefaultClusterCallback callback, int value) {
       writeInt16uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt32uAttribute(LongAttributeCallback callback) {
+    public void readInt32uAttribute(
+      LongAttributeCallback callback
+    ) {
       readInt32uAttribute(chipClusterPtr, callback);
     }
 
@@ -6213,7 +6570,9 @@ public void writeInt32uAttribute(DefaultClusterCallback callback, long value) {
       writeInt32uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt64uAttribute(LongAttributeCallback callback) {
+    public void readInt64uAttribute(
+      LongAttributeCallback callback
+    ) {
       readInt64uAttribute(chipClusterPtr, callback);
     }
 
@@ -6221,7 +6580,9 @@ public void writeInt64uAttribute(DefaultClusterCallback callback, long value) {
       writeInt64uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt8sAttribute(IntegerAttributeCallback callback) {
+    public void readInt8sAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInt8sAttribute(chipClusterPtr, callback);
     }
 
@@ -6229,7 +6590,9 @@ public void writeInt8sAttribute(DefaultClusterCallback callback, int value) {
       writeInt8sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt16sAttribute(IntegerAttributeCallback callback) {
+    public void readInt16sAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInt16sAttribute(chipClusterPtr, callback);
     }
 
@@ -6237,7 +6600,9 @@ public void writeInt16sAttribute(DefaultClusterCallback callback, int value) {
       writeInt16sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt32sAttribute(LongAttributeCallback callback) {
+    public void readInt32sAttribute(
+      LongAttributeCallback callback
+    ) {
       readInt32sAttribute(chipClusterPtr, callback);
     }
 
@@ -6245,7 +6610,9 @@ public void writeInt32sAttribute(DefaultClusterCallback callback, long value) {
       writeInt32sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt64sAttribute(LongAttributeCallback callback) {
+    public void readInt64sAttribute(
+      LongAttributeCallback callback
+    ) {
       readInt64sAttribute(chipClusterPtr, callback);
     }
 
@@ -6253,7 +6620,9 @@ public void writeInt64sAttribute(DefaultClusterCallback callback, long value) {
       writeInt64sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnum8Attribute(IntegerAttributeCallback callback) {
+    public void readEnum8Attribute(
+      IntegerAttributeCallback callback
+    ) {
       readEnum8Attribute(chipClusterPtr, callback);
     }
 
@@ -6261,7 +6630,9 @@ public void writeEnum8Attribute(DefaultClusterCallback callback, int value) {
       writeEnum8Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnum16Attribute(IntegerAttributeCallback callback) {
+    public void readEnum16Attribute(
+      IntegerAttributeCallback callback
+    ) {
       readEnum16Attribute(chipClusterPtr, callback);
     }
 
@@ -6269,7 +6640,9 @@ public void writeEnum16Attribute(DefaultClusterCallback callback, int value) {
       writeEnum16Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readOctetStringAttribute(OctetStringAttributeCallback callback) {
+    public void readOctetStringAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readOctetStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6277,20 +6650,27 @@ public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] va
       writeOctetStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readListInt8uAttribute(ListInt8uAttributeCallback callback) {
+    public void readListInt8uAttribute(
+      ListInt8uAttributeCallback callback
+    ) {
       readListInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public void readListOctetStringAttribute(ListOctetStringAttributeCallback callback) {
+    public void readListOctetStringAttribute(
+      ListOctetStringAttributeCallback callback
+    ) {
       readListOctetStringAttribute(chipClusterPtr, callback);
     }
 
     public void readListStructOctetStringAttribute(
-        ListStructOctetStringAttributeCallback callback) {
+      ListStructOctetStringAttributeCallback callback
+    ) {
       readListStructOctetStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readLongOctetStringAttribute(OctetStringAttributeCallback callback) {
+    public void readLongOctetStringAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readLongOctetStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6298,7 +6678,9 @@ public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[
       writeLongOctetStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readCharStringAttribute(CharStringAttributeCallback callback) {
+    public void readCharStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readCharStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6306,7 +6688,9 @@ public void writeCharStringAttribute(DefaultClusterCallback callback, String val
       writeCharStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readLongCharStringAttribute(CharStringAttributeCallback callback) {
+    public void readLongCharStringAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readLongCharStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6314,7 +6698,9 @@ public void writeLongCharStringAttribute(DefaultClusterCallback callback, String
       writeLongCharStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEpochUsAttribute(LongAttributeCallback callback) {
+    public void readEpochUsAttribute(
+      LongAttributeCallback callback
+    ) {
       readEpochUsAttribute(chipClusterPtr, callback);
     }
 
@@ -6322,7 +6708,9 @@ public void writeEpochUsAttribute(DefaultClusterCallback callback, long value) {
       writeEpochUsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEpochSAttribute(LongAttributeCallback callback) {
+    public void readEpochSAttribute(
+      LongAttributeCallback callback
+    ) {
       readEpochSAttribute(chipClusterPtr, callback);
     }
 
@@ -6330,6 +6718,7 @@ public void writeEpochSAttribute(DefaultClusterCallback callback, long value) {
       writeEpochSAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
     public void readVendorIdAttribute(IntegerAttributeCallback callback) {
       readVendorIdAttribute(chipClusterPtr, callback);
     }
@@ -6339,6 +6728,11 @@ public void writeVendorIdAttribute(DefaultClusterCallback callback, int value) {
     }
 
     public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
+=======
+    public void readUnsupportedAttribute(
+      BooleanAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readUnsupportedAttribute(chipClusterPtr, callback);
     }
 
@@ -6346,65 +6740,155 @@ public void writeUnsupportedAttribute(DefaultClusterCallback callback, boolean v
       writeUnsupportedAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readBooleanAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
-    private native void readBooleanAttribute(
-        long chipClusterPtr, BooleanAttributeCallback callback);
+    private native void writeBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+  
+    private native void readBitmap8Attribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeBooleanAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+    private native void writeBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readBitmap16Attribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readBitmap8Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readBitmap32Attribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void writeBitmap8Attribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readBitmap64Attribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void readBitmap16Attribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readInt8uAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeBitmap16Attribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readInt16uAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readInt32uAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void writeBitmap32Attribute(
-        long chipClusterPtr, DefaultClusterCallback callback, long value);
+    private native void writeInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readInt64uAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void readBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readInt8sAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeBitmap64Attribute(
-        long chipClusterPtr, DefaultClusterCallback callback, long value);
+    private native void writeInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readInt16sAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readInt32sAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void writeInt8uAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readInt64sAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void readInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readEnum8Attribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeInt16uAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readEnum16Attribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOctetStringAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
 
-    private native void writeInt32uAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, long value);
+    private native void writeOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
+  
+    private native void readListInt8uAttribute(long chipClusterPtr,
+      ListInt8uAttributeCallback callback
+    );
+  
+    private native void readListOctetStringAttribute(long chipClusterPtr,
+      ListOctetStringAttributeCallback callback
+    );
+  
+    private native void readListStructOctetStringAttribute(long chipClusterPtr,
+      ListStructOctetStringAttributeCallback callback
+    );
+  
+    private native void readLongOctetStringAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
 
-    private native void readInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback);
+    private native void writeLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
+  
+    private native void readCharStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
 
-    private native void writeInt64uAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, long value);
+    private native void writeCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
+  
+    private native void readLongCharStringAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
 
-    private native void readInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeLongCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
+  
+    private native void readEpochUsAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void writeInt8sAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeEpochUsAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readEpochSAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
 
-    private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeEpochSAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
+  
+    private native void readUnsupportedAttribute(long chipClusterPtr,
+      BooleanAttributeCallback callback
+    );
 
+<<<<<<< HEAD
     private native void writeInt16sAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
@@ -6485,6 +6969,13 @@ private native void writeUnsupportedAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void writeUnsupportedAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 
   public static class ThermostatCluster extends BaseChipCluster {
@@ -6503,58 +6994,40 @@ public void clearWeeklySchedule(DefaultClusterCallback callback) {
       clearWeeklySchedule(chipClusterPtr, callback);
     }
 
+
     public void getRelayStatusLog(DefaultClusterCallback callback) {
       getRelayStatusLog(chipClusterPtr, callback);
     }
 
-    public void getWeeklySchedule(
-        DefaultClusterCallback callback, int daysToReturn, int modeToReturn) {
+
+    public void getWeeklySchedule(DefaultClusterCallback callback, int daysToReturn, int modeToReturn) {
       getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn);
     }
 
-    public void setWeeklySchedule(
-        DefaultClusterCallback callback,
-        int numberOfTransitionsForSequence,
-        int dayOfWeekForSequence,
-        int modeForSequence,
-        int payload) {
-      setWeeklySchedule(
-          chipClusterPtr,
-          callback,
-          numberOfTransitionsForSequence,
-          dayOfWeekForSequence,
-          modeForSequence,
-          payload);
+
+    public void setWeeklySchedule(DefaultClusterCallback callback, int numberOfTransitionsForSequence, int dayOfWeekForSequence, int modeForSequence, int payload) {
+      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, payload);
     }
 
+
     public void setpointRaiseLower(DefaultClusterCallback callback, int mode, int amount) {
       setpointRaiseLower(chipClusterPtr, callback, mode, amount);
     }
 
     private native void clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback);
-
     private native void getRelayStatusLog(long chipClusterPtr, DefaultClusterCallback callback);
+    private native void getWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, int daysToReturn, int modeToReturn);
+    private native void setWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, int numberOfTransitionsForSequence, int dayOfWeekForSequence, int modeForSequence, int payload);
+    private native void setpointRaiseLower(long chipClusterPtr, DefaultClusterCallback callback, int mode, int amount);
 
-    private native void getWeeklySchedule(
-        long chipClusterPtr, DefaultClusterCallback callback, int daysToReturn, int modeToReturn);
-
-    private native void setWeeklySchedule(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int numberOfTransitionsForSequence,
-        int dayOfWeekForSequence,
-        int modeForSequence,
-        int payload);
-
-    private native void setpointRaiseLower(
-        long chipClusterPtr, DefaultClusterCallback callback, int mode, int amount);
 
-    public void readLocalTemperatureAttribute(IntegerAttributeCallback callback) {
+    public void readLocalTemperatureAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readLocalTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLocalTemperatureAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeLocalTemperatureAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -6562,23 +7035,33 @@ public void reportLocalTemperatureAttribute(IntegerAttributeCallback callback) {
       reportLocalTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readAbsMinHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readAbsMaxHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readAbsMinCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readAbsMaxCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupiedCoolingSetpointAttribute(IntegerAttributeCallback callback) {
+    public void readOccupiedCoolingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
     }
 
@@ -6586,7 +7069,9 @@ public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callbac
       writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOccupiedHeatingSetpointAttribute(IntegerAttributeCallback callback) {
+    public void readOccupiedHeatingSetpointAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
     }
 
@@ -6594,7 +7079,9 @@ public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callbac
       writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readMinHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -6602,7 +7089,9 @@ public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readMaxHeatSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -6610,7 +7099,9 @@ public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readMinCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -6618,7 +7109,9 @@ public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
+    public void readMaxCoolSetpointLimitAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -6626,6 +7119,7 @@ public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
     public void readMinSetpointDeadBandAttribute(IntegerAttributeCallback callback) {
       readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
     }
@@ -6635,15 +7129,21 @@ public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, i
     }
 
     public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
+=======
+    public void readControlSequenceOfOperationAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
     }
 
-    public void writeControlSequenceOfOperationAttribute(
-        DefaultClusterCallback callback, int value) {
+    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, int value) {
       writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readSystemModeAttribute(IntegerAttributeCallback callback) {
+    public void readSystemModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSystemModeAttribute(chipClusterPtr, callback);
     }
 
@@ -6651,53 +7151,107 @@ public void writeSystemModeAttribute(DefaultClusterCallback callback, int value)
       writeSystemModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartOfWeekAttribute(IntegerAttributeCallback callback) {
+    public void readStartOfWeekAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStartOfWeekAttribute(chipClusterPtr, callback);
     }
 
-    public void readNumberOfWeeklyTransitionsAttribute(IntegerAttributeCallback callback) {
+    public void readNumberOfWeeklyTransitionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readNumberOfDailyTransitionsAttribute(IntegerAttributeCallback callback) {
+    public void readNumberOfDailyTransitionsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(LongAttributeCallback callback) {
+    public void readFeatureMapAttribute(
+      LongAttributeCallback callback
+    ) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readLocalTemperatureAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readLocalTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeLocalTemperatureAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeLocalTemperatureAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportLocalTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readAbsMinHeatSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readAbsMinCoolSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readOccupiedCoolingSetpointAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportLocalTemperatureAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeOccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readOccupiedHeatingSetpointAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readAbsMinHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeOccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readMinHeatSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readAbsMaxHeatSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeMinHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readMaxHeatSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readAbsMinCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeMaxHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readMinCoolSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readAbsMaxCoolSetpointLimitAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeMinCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readMaxCoolSetpointLimitAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readOccupiedCoolingSetpointAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeMaxCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readControlSequenceOfOperationAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeOccupiedCoolingSetpointAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeControlSequenceOfOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readSystemModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
+<<<<<<< HEAD
     private native void readOccupiedHeatingSetpointAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -6760,6 +7314,29 @@ private native void readFeatureMapAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readStartOfWeekAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readNumberOfWeeklyTransitionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readNumberOfDailyTransitionsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readFeatureMapAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 
   public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
@@ -6774,7 +7351,10 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readTemperatureDisplayModeAttribute(IntegerAttributeCallback callback) {
+
+    public void readTemperatureDisplayModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
     }
 
@@ -6782,7 +7362,9 @@ public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback
       writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readKeypadLockoutAttribute(IntegerAttributeCallback callback) {
+    public void readKeypadLockoutAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readKeypadLockoutAttribute(chipClusterPtr, callback);
     }
 
@@ -6790,39 +7372,43 @@ public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, int val
       writeKeypadLockoutAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readScheduleProgrammingVisibilityAttribute(IntegerAttributeCallback callback) {
+    public void readScheduleProgrammingVisibilityAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
     }
 
-    public void writeScheduleProgrammingVisibilityAttribute(
-        DefaultClusterCallback callback, int value) {
+    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, int value) {
       writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readTemperatureDisplayModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readTemperatureDisplayModeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeTemperatureDisplayModeAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readKeypadLockoutAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void writeKeypadLockoutAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
-
-    private native void readScheduleProgrammingVisibilityAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeTemperatureDisplayModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readKeypadLockoutAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void writeScheduleProgrammingVisibilityAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int value);
+    private native void writeKeypadLockoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readScheduleProgrammingVisibilityAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void writeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -6845,35 +7431,36 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     public static class NeighborTableListAttribute {
       public long extAddress;
-      public long age;
-      public int rloc16;
-      public long linkFrameCounter;
-      public long mleFrameCounter;
-      public int lqi;
-      public int averageRssi;
-      public int lastRssi;
-      public int frameErrorRate;
-      public int messageErrorRate;
-      public boolean rxOnWhenIdle;
-      public boolean fullThreadDevice;
-      public boolean fullNetworkData;
-      public boolean isChild;
-
+            public long age;
+            public int rloc16;
+            public long linkFrameCounter;
+            public long mleFrameCounter;
+            public int lqi;
+            public int averageRssi;
+            public int lastRssi;
+            public int frameErrorRate;
+            public int messageErrorRate;
+            public boolean rxOnWhenIdle;
+            public boolean fullThreadDevice;
+            public boolean fullNetworkData;
+            public boolean isChild;
+      
       public NeighborTableListAttribute(
-          long extAddress,
-          long age,
-          int rloc16,
-          long linkFrameCounter,
-          long mleFrameCounter,
-          int lqi,
-          int averageRssi,
-          int lastRssi,
-          int frameErrorRate,
-          int messageErrorRate,
-          boolean rxOnWhenIdle,
-          boolean fullThreadDevice,
-          boolean fullNetworkData,
-          boolean isChild) {
+        long extAddress,
+                long age,
+                int rloc16,
+                long linkFrameCounter,
+                long mleFrameCounter,
+                int lqi,
+                int averageRssi,
+                int lastRssi,
+                int frameErrorRate,
+                int messageErrorRate,
+                boolean rxOnWhenIdle,
+                boolean fullThreadDevice,
+                boolean fullNetworkData,
+                boolean isChild
+              ) {
         this.extAddress = extAddress;
         this.age = age;
         this.rloc16 = rloc16;
@@ -6892,34 +7479,35 @@ public NeighborTableListAttribute(
     }
 
     public interface NeighborTableListAttributeCallback {
-      void onSuccess(List<NeighborTableListAttribute> valueList);
-
+      void onSuccess(List<
+      NeighborTableListAttribute
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class RouteTableListAttribute {
       public long extAddress;
-      public int rloc16;
-      public int routerId;
-      public int nextHop;
-      public int pathCost;
-      public int LQIIn;
-      public int LQIOut;
-      public int age;
-      public boolean allocated;
-      public boolean linkEstablished;
-
+            public int rloc16;
+            public int routerId;
+            public int nextHop;
+            public int pathCost;
+            public int LQIIn;
+            public int LQIOut;
+            public int age;
+            public boolean allocated;
+            public boolean linkEstablished;
+      
       public RouteTableListAttribute(
-          long extAddress,
-          int rloc16,
-          int routerId,
-          int nextHop,
-          int pathCost,
-          int LQIIn,
-          int LQIOut,
-          int age,
-          boolean allocated,
-          boolean linkEstablished) {
+        long extAddress,
+                int rloc16,
+                int routerId,
+                int nextHop,
+                int pathCost,
+                int LQIIn,
+                int LQIOut,
+                int age,
+                boolean allocated,
+                boolean linkEstablished
+              ) {
         this.extAddress = extAddress;
         this.rloc16 = rloc16;
         this.routerId = routerId;
@@ -6934,54 +7522,58 @@ public RouteTableListAttribute(
     }
 
     public interface RouteTableListAttributeCallback {
-      void onSuccess(List<RouteTableListAttribute> valueList);
-
+      void onSuccess(List<
+      RouteTableListAttribute
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class SecurityPolicyAttribute {
       public int rotationTime;
-      public int flags;
-
-      public SecurityPolicyAttribute(int rotationTime, int flags) {
+            public int flags;
+      
+      public SecurityPolicyAttribute(
+        int rotationTime,
+                int flags
+              ) {
         this.rotationTime = rotationTime;
         this.flags = flags;
       }
     }
 
     public interface SecurityPolicyAttributeCallback {
-      void onSuccess(List<SecurityPolicyAttribute> valueList);
-
+      void onSuccess(List<
+      SecurityPolicyAttribute
+      > valueList);
       void onError(Exception ex);
     }
-
     public static class OperationalDatasetComponentsAttribute {
       public boolean activeTimestampPresent;
-      public boolean pendingTimestampPresent;
-      public boolean masterKeyPresent;
-      public boolean networkNamePresent;
-      public boolean extendedPanIdPresent;
-      public boolean meshLocalPrefixPresent;
-      public boolean delayPresent;
-      public boolean panIdPresent;
-      public boolean channelPresent;
-      public boolean pskcPresent;
-      public boolean securityPolicyPresent;
-      public boolean channelMaskPresent;
-
+            public boolean pendingTimestampPresent;
+            public boolean masterKeyPresent;
+            public boolean networkNamePresent;
+            public boolean extendedPanIdPresent;
+            public boolean meshLocalPrefixPresent;
+            public boolean delayPresent;
+            public boolean panIdPresent;
+            public boolean channelPresent;
+            public boolean pskcPresent;
+            public boolean securityPolicyPresent;
+            public boolean channelMaskPresent;
+      
       public OperationalDatasetComponentsAttribute(
-          boolean activeTimestampPresent,
-          boolean pendingTimestampPresent,
-          boolean masterKeyPresent,
-          boolean networkNamePresent,
-          boolean extendedPanIdPresent,
-          boolean meshLocalPrefixPresent,
-          boolean delayPresent,
-          boolean panIdPresent,
-          boolean channelPresent,
-          boolean pskcPresent,
-          boolean securityPolicyPresent,
-          boolean channelMaskPresent) {
+        boolean activeTimestampPresent,
+                boolean pendingTimestampPresent,
+                boolean masterKeyPresent,
+                boolean networkNamePresent,
+                boolean extendedPanIdPresent,
+                boolean meshLocalPrefixPresent,
+                boolean delayPresent,
+                boolean panIdPresent,
+                boolean channelPresent,
+                boolean pskcPresent,
+                boolean securityPolicyPresent,
+                boolean channelMaskPresent
+              ) {
         this.activeTimestampPresent = activeTimestampPresent;
         this.pendingTimestampPresent = pendingTimestampPresent;
         this.masterKeyPresent = masterKeyPresent;
@@ -6998,464 +7590,658 @@ public OperationalDatasetComponentsAttribute(
     }
 
     public interface OperationalDatasetComponentsAttributeCallback {
-      void onSuccess(List<OperationalDatasetComponentsAttribute> valueList);
-
+      void onSuccess(List<
+      OperationalDatasetComponentsAttribute
+      > valueList);
       void onError(Exception ex);
     }
 
     public interface ActiveNetworkFaultsListAttributeCallback {
-      void onSuccess(List<Integer> valueList);
-
+      void onSuccess(List<
+        Integer
+              > valueList);
       void onError(Exception ex);
     }
 
-    public void readChannelAttribute(IntegerAttributeCallback callback) {
+    public void readChannelAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readChannelAttribute(chipClusterPtr, callback);
     }
 
-    public void readRoutingRoleAttribute(IntegerAttributeCallback callback) {
+    public void readRoutingRoleAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRoutingRoleAttribute(chipClusterPtr, callback);
     }
 
-    public void readNetworkNameAttribute(OctetStringAttributeCallback callback) {
+    public void readNetworkNameAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readNetworkNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readPanIdAttribute(IntegerAttributeCallback callback) {
+    public void readPanIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPanIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readExtendedPanIdAttribute(LongAttributeCallback callback) {
+    public void readExtendedPanIdAttribute(
+      LongAttributeCallback callback
+    ) {
       readExtendedPanIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readMeshLocalPrefixAttribute(OctetStringAttributeCallback callback) {
+    public void readMeshLocalPrefixAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readMeshLocalPrefixAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+    public void readOverrunCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readNeighborTableListAttribute(NeighborTableListAttributeCallback callback) {
+    public void readNeighborTableListAttribute(
+      NeighborTableListAttributeCallback callback
+    ) {
       readNeighborTableListAttribute(chipClusterPtr, callback);
     }
 
-    public void readRouteTableListAttribute(RouteTableListAttributeCallback callback) {
+    public void readRouteTableListAttribute(
+      RouteTableListAttributeCallback callback
+    ) {
       readRouteTableListAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartitionIdAttribute(LongAttributeCallback callback) {
+    public void readPartitionIdAttribute(
+      LongAttributeCallback callback
+    ) {
       readPartitionIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readWeightingAttribute(IntegerAttributeCallback callback) {
+    public void readWeightingAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readWeightingAttribute(chipClusterPtr, callback);
     }
 
-    public void readDataVersionAttribute(IntegerAttributeCallback callback) {
+    public void readDataVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readDataVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readStableDataVersionAttribute(IntegerAttributeCallback callback) {
+    public void readStableDataVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readStableDataVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readLeaderRouterIdAttribute(IntegerAttributeCallback callback) {
+    public void readLeaderRouterIdAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readLeaderRouterIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readDetachedRoleCountAttribute(IntegerAttributeCallback callback) {
+    public void readDetachedRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readDetachedRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readChildRoleCountAttribute(IntegerAttributeCallback callback) {
+    public void readChildRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readChildRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRouterRoleCountAttribute(IntegerAttributeCallback callback) {
+    public void readRouterRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRouterRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readLeaderRoleCountAttribute(IntegerAttributeCallback callback) {
+    public void readLeaderRoleCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readLeaderRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
+    public void readAttachAttemptCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartitionIdChangeCountAttribute(IntegerAttributeCallback callback) {
+    public void readPartitionIdChangeCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readBetterPartitionAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
+    public void readBetterPartitionAttachAttemptCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readParentChangeCountAttribute(IntegerAttributeCallback callback) {
+    public void readParentChangeCountAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readParentChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxTotalCountAttribute(LongAttributeCallback callback) {
+    public void readTxTotalCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxTotalCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxUnicastCountAttribute(LongAttributeCallback callback) {
+    public void readTxUnicastCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxUnicastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBroadcastCountAttribute(LongAttributeCallback callback) {
+    public void readTxBroadcastCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxBroadcastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxAckRequestedCountAttribute(LongAttributeCallback callback) {
+    public void readTxAckRequestedCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxAckedCountAttribute(LongAttributeCallback callback) {
+    public void readTxAckedCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxAckedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxNoAckRequestedCountAttribute(LongAttributeCallback callback) {
+    public void readTxNoAckRequestedCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDataCountAttribute(LongAttributeCallback callback) {
+    public void readTxDataCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxDataCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDataPollCountAttribute(LongAttributeCallback callback) {
+    public void readTxDataPollCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxDataPollCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBeaconCountAttribute(LongAttributeCallback callback) {
+    public void readTxBeaconCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxBeaconCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBeaconRequestCountAttribute(LongAttributeCallback callback) {
+    public void readTxBeaconRequestCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxOtherCountAttribute(LongAttributeCallback callback) {
+    public void readTxOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxRetryCountAttribute(LongAttributeCallback callback) {
+    public void readTxRetryCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxRetryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
+    public void readTxDirectMaxRetryExpiryCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxIndirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
+    public void readTxIndirectMaxRetryExpiryCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrCcaCountAttribute(LongAttributeCallback callback) {
+    public void readTxErrCcaCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxErrCcaCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrAbortCountAttribute(LongAttributeCallback callback) {
+    public void readTxErrAbortCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxErrAbortCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrBusyChannelCountAttribute(LongAttributeCallback callback) {
+    public void readTxErrBusyChannelCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxTotalCountAttribute(LongAttributeCallback callback) {
+    public void readRxTotalCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxTotalCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxUnicastCountAttribute(LongAttributeCallback callback) {
+    public void readRxUnicastCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxUnicastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBroadcastCountAttribute(LongAttributeCallback callback) {
+    public void readRxBroadcastCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxBroadcastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDataCountAttribute(LongAttributeCallback callback) {
+    public void readRxDataCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxDataCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDataPollCountAttribute(LongAttributeCallback callback) {
+    public void readRxDataPollCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxDataPollCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBeaconCountAttribute(LongAttributeCallback callback) {
+    public void readRxBeaconCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxBeaconCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBeaconRequestCountAttribute(LongAttributeCallback callback) {
+    public void readRxBeaconRequestCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxOtherCountAttribute(LongAttributeCallback callback) {
+    public void readRxOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxAddressFilteredCountAttribute(LongAttributeCallback callback) {
+    public void readRxAddressFilteredCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDestAddrFilteredCountAttribute(LongAttributeCallback callback) {
+    public void readRxDestAddrFilteredCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDuplicatedCountAttribute(LongAttributeCallback callback) {
+    public void readRxDuplicatedCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxDuplicatedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrNoFrameCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrNoFrameCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrUnknownNeighborCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrUnknownNeighborCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrInvalidSrcAddrCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrInvalidSrcAddrCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrSecCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrSecCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrSecCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrFcsCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrFcsCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrFcsCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrOtherCountAttribute(LongAttributeCallback callback) {
+    public void readRxErrOtherCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readRxErrOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readActiveTimestampAttribute(LongAttributeCallback callback) {
+    public void readActiveTimestampAttribute(
+      LongAttributeCallback callback
+    ) {
       readActiveTimestampAttribute(chipClusterPtr, callback);
     }
 
-    public void readPendingTimestampAttribute(LongAttributeCallback callback) {
+    public void readPendingTimestampAttribute(
+      LongAttributeCallback callback
+    ) {
       readPendingTimestampAttribute(chipClusterPtr, callback);
     }
 
-    public void readDelayAttribute(LongAttributeCallback callback) {
+    public void readDelayAttribute(
+      LongAttributeCallback callback
+    ) {
       readDelayAttribute(chipClusterPtr, callback);
     }
 
-    public void readSecurityPolicyAttribute(SecurityPolicyAttributeCallback callback) {
+    public void readSecurityPolicyAttribute(
+      SecurityPolicyAttributeCallback callback
+    ) {
       readSecurityPolicyAttribute(chipClusterPtr, callback);
     }
 
-    public void readChannelMaskAttribute(OctetStringAttributeCallback callback) {
+    public void readChannelMaskAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readChannelMaskAttribute(chipClusterPtr, callback);
     }
 
     public void readOperationalDatasetComponentsAttribute(
-        OperationalDatasetComponentsAttributeCallback callback) {
+      OperationalDatasetComponentsAttributeCallback callback
+    ) {
       readOperationalDatasetComponentsAttribute(chipClusterPtr, callback);
     }
 
     public void readActiveNetworkFaultsListAttribute(
-        ActiveNetworkFaultsListAttributeCallback callback) {
+      ActiveNetworkFaultsListAttributeCallback callback
+    ) {
       readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readChannelAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRoutingRoleAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readNetworkNameAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readPanIdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readExtendedPanIdAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readMeshLocalPrefixAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readNeighborTableListAttribute(
-        long chipClusterPtr, NeighborTableListAttributeCallback callback);
-
-    private native void readRouteTableListAttribute(
-        long chipClusterPtr, RouteTableListAttributeCallback callback);
-
-    private native void readPartitionIdAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readWeightingAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readStableDataVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readLeaderRouterIdAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readDetachedRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readChildRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRouterRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readLeaderRoleCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readPartitionIdChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBetterPartitionAttachAttemptCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readParentChangeCountAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readTxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxAckedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxNoAckRequestedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxRetryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxDirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxIndirectMaxRetryExpiryCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxErrCcaCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxErrAbortCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readTxErrBusyChannelCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxTotalCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxUnicastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxBroadcastCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxDataCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxDataPollCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxBeaconCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxBeaconRequestCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxAddressFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxDestAddrFilteredCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxDuplicatedCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrNoFrameCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrUnknownNeighborCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrInvalidSrcAddrCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrSecCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrFcsCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readRxErrOtherCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readActiveTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPendingTimestampAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readDelayAttribute(long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readSecurityPolicyAttribute(
-        long chipClusterPtr, SecurityPolicyAttributeCallback callback);
-
-    private native void readChannelMaskAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readOperationalDatasetComponentsAttribute(
-        long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback);
-
-    private native void readActiveNetworkFaultsListAttribute(
-        long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readChannelAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRoutingRoleAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readNetworkNameAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readPanIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readExtendedPanIdAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readMeshLocalPrefixAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readNeighborTableListAttribute(long chipClusterPtr,
+      NeighborTableListAttributeCallback callback
+    );
+  
+    private native void readRouteTableListAttribute(long chipClusterPtr,
+      RouteTableListAttributeCallback callback
+    );
+  
+    private native void readPartitionIdAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readWeightingAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readDataVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readStableDataVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readLeaderRouterIdAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readDetachedRoleCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readChildRoleCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRouterRoleCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readLeaderRoleCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readAttachAttemptCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readPartitionIdChangeCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readParentChangeCountAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readTxTotalCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxUnicastCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxBroadcastCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxAckRequestedCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxAckedCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxNoAckRequestedCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxDataCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxDataPollCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxBeaconCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxBeaconRequestCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxOtherCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxRetryCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxErrCcaCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxErrAbortCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readTxErrBusyChannelCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxTotalCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxUnicastCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxBroadcastCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxDataCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxDataPollCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxBeaconCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxBeaconRequestCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxOtherCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxAddressFilteredCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxDestAddrFilteredCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxDuplicatedCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrNoFrameCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrUnknownNeighborCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrSecCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrFcsCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readRxErrOtherCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readActiveTimestampAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPendingTimestampAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readDelayAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readSecurityPolicyAttribute(long chipClusterPtr,
+      SecurityPolicyAttributeCallback callback
+    );
+  
+    private native void readChannelMaskAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readOperationalDatasetComponentsAttribute(long chipClusterPtr,
+      OperationalDatasetComponentsAttributeCallback callback
+    );
+  
+    private native void readActiveNetworkFaultsListAttribute(long chipClusterPtr,
+      ActiveNetworkFaultsListAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class WakeOnLanCluster extends BaseChipCluster {
@@ -7470,19 +8256,26 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void readWakeOnLanMacAddressAttribute(CharStringAttributeCallback callback) {
+
+    public void readWakeOnLanMacAddressAttribute(
+      CharStringAttributeCallback callback
+    ) {
       readWakeOnLanMacAddressAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readWakeOnLanMacAddressAttribute(
-        long chipClusterPtr, CharStringAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readWakeOnLanMacAddressAttribute(long chipClusterPtr,
+      CharStringAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -7503,102 +8296,146 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readBssidAttribute(OctetStringAttributeCallback callback) {
+
+    public void readBssidAttribute(
+      OctetStringAttributeCallback callback
+    ) {
       readBssidAttribute(chipClusterPtr, callback);
     }
 
-    public void readSecurityTypeAttribute(IntegerAttributeCallback callback) {
+    public void readSecurityTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSecurityTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readWiFiVersionAttribute(IntegerAttributeCallback callback) {
+    public void readWiFiVersionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readWiFiVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readChannelNumberAttribute(IntegerAttributeCallback callback) {
+    public void readChannelNumberAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readChannelNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readRssiAttribute(IntegerAttributeCallback callback) {
+    public void readRssiAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readRssiAttribute(chipClusterPtr, callback);
     }
 
-    public void readBeaconLostCountAttribute(LongAttributeCallback callback) {
+    public void readBeaconLostCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readBeaconLostCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readBeaconRxCountAttribute(LongAttributeCallback callback) {
+    public void readBeaconRxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readBeaconRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketMulticastRxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketMulticastRxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketMulticastTxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketMulticastTxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketUnicastRxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketUnicastRxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketUnicastTxCountAttribute(LongAttributeCallback callback) {
+    public void readPacketUnicastTxCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentMaxRateAttribute(LongAttributeCallback callback) {
+    public void readCurrentMaxRateAttribute(
+      LongAttributeCallback callback
+    ) {
       readCurrentMaxRateAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(LongAttributeCallback callback) {
+    public void readOverrunCountAttribute(
+      LongAttributeCallback callback
+    ) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-
-    private native void readBssidAttribute(
-        long chipClusterPtr, OctetStringAttributeCallback callback);
-
-    private native void readSecurityTypeAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readWiFiVersionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readChannelNumberAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readRssiAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readBeaconLostCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readBeaconRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPacketMulticastRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPacketMulticastTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPacketUnicastRxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readPacketUnicastTxCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readCurrentMaxRateAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readOverrunCountAttribute(
-        long chipClusterPtr, LongAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readBssidAttribute(long chipClusterPtr,
+      OctetStringAttributeCallback callback
+    );
+  
+    private native void readSecurityTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readWiFiVersionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readChannelNumberAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readRssiAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readBeaconLostCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readBeaconRxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPacketMulticastRxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPacketMulticastTxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPacketUnicastRxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readPacketUnicastTxCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readCurrentMaxRateAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readOverrunCountAttribute(long chipClusterPtr,
+      LongAttributeCallback callback
+    );
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
   }
 
   public static class WindowCoveringCluster extends BaseChipCluster {
@@ -7617,106 +8454,104 @@ public void downOrClose(DefaultClusterCallback callback) {
       downOrClose(chipClusterPtr, callback);
     }
 
-    public void goToLiftPercentage(
-        DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue) {
+
+    public void goToLiftPercentage(DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue) {
       goToLiftPercentage(chipClusterPtr, callback, liftPercentageValue, liftPercent100thsValue);
     }
 
+
     public void goToLiftValue(DefaultClusterCallback callback, int liftValue) {
       goToLiftValue(chipClusterPtr, callback, liftValue);
     }
 
-    public void goToTiltPercentage(
-        DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue) {
+
+    public void goToTiltPercentage(DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue) {
       goToTiltPercentage(chipClusterPtr, callback, tiltPercentageValue, tiltPercent100thsValue);
     }
 
+
     public void goToTiltValue(DefaultClusterCallback callback, int tiltValue) {
       goToTiltValue(chipClusterPtr, callback, tiltValue);
     }
 
+
     public void stopMotion(DefaultClusterCallback callback) {
       stopMotion(chipClusterPtr, callback);
     }
 
+
     public void upOrOpen(DefaultClusterCallback callback) {
       upOrOpen(chipClusterPtr, callback);
     }
 
     private native void downOrClose(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void goToLiftPercentage(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int liftPercentageValue,
-        int liftPercent100thsValue);
-
-    private native void goToLiftValue(
-        long chipClusterPtr, DefaultClusterCallback callback, int liftValue);
-
-    private native void goToTiltPercentage(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int tiltPercentageValue,
-        int tiltPercent100thsValue);
-
-    private native void goToTiltValue(
-        long chipClusterPtr, DefaultClusterCallback callback, int tiltValue);
-
+    private native void goToLiftPercentage(long chipClusterPtr, DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue);
+    private native void goToLiftValue(long chipClusterPtr, DefaultClusterCallback callback, int liftValue);
+    private native void goToTiltPercentage(long chipClusterPtr, DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue);
+    private native void goToTiltValue(long chipClusterPtr, DefaultClusterCallback callback, int tiltValue);
     private native void stopMotion(long chipClusterPtr, DefaultClusterCallback callback);
-
     private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readTypeAttribute(IntegerAttributeCallback callback) {
+
+    public void readTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readConfigStatusAttribute(IntegerAttributeCallback callback) {
+    public void readConfigStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readConfigStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftPercentageAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionLiftPercentageAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionLiftPercentageAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftPercentageAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionLiftPercentageAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionLiftPercentageAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltPercentageAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionTiltPercentageAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionTiltPercentageAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltPercentageAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercentageAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionTiltPercentageAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void readOperationalStatusAttribute(IntegerAttributeCallback callback) {
+    public void readOperationalStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readOperationalStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOperationalStatusAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOperationalStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -7724,83 +8559,95 @@ public void reportOperationalStatusAttribute(IntegerAttributeCallback callback)
       reportOperationalStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readTargetPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
+    public void readTargetPositionLiftPercent100thsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTargetPositionLiftPercent100thsAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetPositionLiftPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetPositionLiftPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportTargetPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readTargetPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
+    public void readTargetPositionTiltPercent100thsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTargetPositionTiltPercent100thsAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetPositionTiltPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetPositionTiltPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportTargetPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readEndProductTypeAttribute(IntegerAttributeCallback callback) {
+    public void readEndProductTypeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readEndProductTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionLiftPercent100thsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionLiftPercent100thsAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
+    public void readCurrentPositionTiltPercent100thsAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionTiltPercent100thsAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltPercent100thsAttribute(
-          chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledOpenLimitLiftAttribute(IntegerAttributeCallback callback) {
+    public void readInstalledOpenLimitLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
+    public void readInstalledClosedLimitLiftAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledOpenLimitTiltAttribute(IntegerAttributeCallback callback) {
+    public void readInstalledOpenLimitTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
+    public void readInstalledClosedLimitTiltAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readModeAttribute(IntegerAttributeCallback callback) {
+    public void readModeAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readModeAttribute(chipClusterPtr, callback);
     }
 
@@ -7808,12 +8655,13 @@ public void writeModeAttribute(DefaultClusterCallback callback, int value) {
       writeModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readSafetyStatusAttribute(IntegerAttributeCallback callback) {
+    public void readSafetyStatusAttribute(
+      IntegerAttributeCallback callback
+    ) {
       readSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSafetyStatusAttribute(
-        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeSafetyStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -7821,61 +8669,125 @@ public void reportSafetyStatusAttribute(IntegerAttributeCallback callback) {
       reportSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> e83b94d19 (need to wait for cast-helper)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
+  
+    private native void readTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentPositionLiftAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentPositionTiltAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readConfigStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentPositionLiftPercentageAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentPositionLiftPercentageAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentPositionLiftAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentPositionLiftPercentageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readCurrentPositionTiltPercentageAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCurrentPositionTiltAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentPositionTiltPercentageAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readConfigStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentPositionTiltPercentageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readOperationalStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readCurrentPositionLiftPercentageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeOperationalStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCurrentPositionLiftPercentageAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportOperationalStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readTargetPositionLiftPercent100thsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportCurrentPositionLiftPercentageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readCurrentPositionTiltPercentageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readTargetPositionTiltPercent100thsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void subscribeCurrentPositionTiltPercentageAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportCurrentPositionTiltPercentageAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readEndProductTypeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void readOperationalStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeOperationalStatusAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportOperationalStatusAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void readTargetPositionLiftPercent100thsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void reportCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readInstalledOpenLimitLiftAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readInstalledClosedLimitLiftAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readInstalledOpenLimitTiltAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readInstalledClosedLimitTiltAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+  
+    private native void readModeAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void subscribeTargetPositionLiftPercent100thsAttribute(
-        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void writeModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
+  
+    private native void readSafetyStatusAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
 
-    private native void reportTargetPositionLiftPercent100thsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
+    private native void subscribeSafetyStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
+<<<<<<< HEAD
     private native void readTargetPositionTiltPercent100thsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -7937,5 +8849,12 @@ private native void readFeatureMapAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+    private native void reportSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+  
+    private native void readClusterRevisionAttribute(long chipClusterPtr,
+      IntegerAttributeCallback callback
+    );
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index c533577d8172ad..620610c9319f1e 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -19,9 +19,13 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 import chip.clusterinfo.ClusterCommandCallback;
+=======
+import java.util.*;
+>>>>>>> e83b94d19 (need to wait for cast-helper)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameterInfo;
@@ -7498,14 +7502,15 @@ public Map<String, ClusterInfo> getClusterMap() {
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameter;
+import chip.clusterinfo.ParameterType;
 import chip.clusterinfo.DelegatedClusterCallback;
+import chip.clusterinfo.ClusterCommandCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import java.util.*;
+
 
 public class ClusterInfoMapping {
 
-  class DelegatedDefaultClusterCallback
-      implements DefaultClusterCallback, DelegatedClusterCallback {
+  class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -7513,8 +7518,7 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
       this.callback = callback;
     }
 
-    // Parameters and list-adds here should be generated - refer to the template code that creates
-    // each callback interface.
+    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
     @Override
     public void onSuccess() {
       List<Object> responseValues = new ArrayList<>();
@@ -7527,6 +7531,7 @@ public void onError(Exception e) {
     }
   }
 
+<<<<<<< HEAD
   public Map<String, ClusterInfo> getClusterMap() {
     Map<String, ClusterInfo> clusterMap = new HashMap<>();
     Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
@@ -11229,5 +11234,3732 @@ >>>>>>> a4fd0282e (no error code generation)
     clusterMap.put("windowCovering", windowCovering_clusterInfo);
     return clusterMap;
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+ public Map<String, ClusterInfo> getClusterMap() {
+     Map<String, ClusterInfo> clusterMap = new HashMap<>();
+     Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> accountLogin_getSetupPIN_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter accountLogin_getSetupPIN_commandParameter = new CommandParameter("AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
+                 CommandParameter accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter = new CommandParameter("tempAccountIdentifier", String.class);
+                 accountLogin_getSetupPIN_commandParams.put("tempAccountIdentifier",accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter);
+                 
+           // Populate commands
+           CommandInfo accountLogin_getSetupPIN_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AccountLoginCluster) cluster)
+                           .getSetupPIN((ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback
+                           ,  accountLogin_getSetupPIN_commandParams.get("tempAccountIdentifier") commandArguments.get("tempAccountIdentifier")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   accountLogin_getSetupPIN_commandParams
+           );
+           accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
+           Map<String, CommandParameter> accountLogin_login_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter accountLogin_login_commandParameter = new CommandParameter("AccountLogin", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter accountLogin_login_tempAccountIdentifier_commandParameter = new CommandParameter("tempAccountIdentifier", String.class);
+                 accountLogin_login_commandParams.put("tempAccountIdentifier",accountLogin_login_tempAccountIdentifier_commandParameter);
+                  
+                 CommandParameter accountLogin_login_setupPIN_commandParameter = new CommandParameter("setupPIN", String.class);
+                 accountLogin_login_commandParams.put("setupPIN",accountLogin_login_setupPIN_commandParameter);
+                 
+           // Populate commands
+           CommandInfo accountLogin_login_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AccountLoginCluster) cluster)
+                          .login((DefaultClusterCallback) callback
+                          ,  accountLogin_login_commandParams.get("tempAccountIdentifier") commandArguments.get("tempAccountIdentifier")
+                          ,  accountLogin_login_commandParams.get("setupPIN") commandArguments.get("setupPIN")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   accountLogin_login_commandParams
+           );
+           accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
+     // Populate cluster
+     ClusterInfo accountLogin_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId), accountLogin_ClusterCommandInfo);
+     clusterMap.put("accountLogin", accountLogin_clusterInfo);
+     Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter administratorCommissioning_openBasicCommissioningWindow_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter = new CommandParameter("commissioningTimeout", int.class);
+                 administratorCommissioning_openBasicCommissioningWindow_commandParams.put("commissioningTimeout",administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
+                 
+           // Populate commands
+           CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                          .openBasicCommissioningWindow((DefaultClusterCallback) callback
+                          ,  administratorCommissioning_openBasicCommissioningWindow_commandParams.get("commissioningTimeout") commandArguments.get("commissioningTimeout")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   administratorCommissioning_openBasicCommissioningWindow_commandParams
+           );
+           administratorCommissioning_ClusterCommandInfo.put("openBasicCommissioningWindow", administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
+           Map<String, CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter administratorCommissioning_openCommissioningWindow_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter = new CommandParameter("commissioningTimeout", int.class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("commissioningTimeout",administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter);
+                  
+                 CommandParameter administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter = new CommandParameter("PAKEVerifier", byte[].class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("PAKEVerifier",administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter);
+                  
+                 CommandParameter administratorCommissioning_openCommissioningWindow_discriminator_commandParameter = new CommandParameter("discriminator", int.class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("discriminator",administratorCommissioning_openCommissioningWindow_discriminator_commandParameter);
+                  
+                 CommandParameter administratorCommissioning_openCommissioningWindow_iterations_commandParameter = new CommandParameter("iterations", long.class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("iterations",administratorCommissioning_openCommissioningWindow_iterations_commandParameter);
+                  
+                 CommandParameter administratorCommissioning_openCommissioningWindow_salt_commandParameter = new CommandParameter("salt", byte[].class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("salt",administratorCommissioning_openCommissioningWindow_salt_commandParameter);
+                  
+                 CommandParameter administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter = new CommandParameter("passcodeID", int.class);
+                 administratorCommissioning_openCommissioningWindow_commandParams.put("passcodeID",administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter);
+                 
+           // Populate commands
+           CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                          .openCommissioningWindow((DefaultClusterCallback) callback
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("commissioningTimeout") commandArguments.get("commissioningTimeout")
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("PAKEVerifier") commandArguments.get("PAKEVerifier")
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("discriminator") commandArguments.get("discriminator")
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("iterations") commandArguments.get("iterations")
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("salt") commandArguments.get("salt")
+                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("passcodeID") commandArguments.get("passcodeID")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   administratorCommissioning_openCommissioningWindow_commandParams
+           );
+           administratorCommissioning_ClusterCommandInfo.put("openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
+           Map<String, CommandParameter> administratorCommissioning_revokeCommissioning_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter administratorCommissioning_revokeCommissioning_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                          .revokeCommissioning((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   administratorCommissioning_revokeCommissioning_commandParams
+           );
+           administratorCommissioning_ClusterCommandInfo.put("revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
+     // Populate cluster
+     ClusterInfo administratorCommissioning_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId), administratorCommissioning_ClusterCommandInfo);
+     clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
+     Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> applicationBasic_changeStatus_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter applicationBasic_changeStatus_commandParameter = new CommandParameter("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter applicationBasic_changeStatus_status_commandParameter = new CommandParameter("status", int.class);
+                 applicationBasic_changeStatus_commandParams.put("status",applicationBasic_changeStatus_status_commandParameter);
+                 
+           // Populate commands
+           CommandInfo applicationBasic_changeStatus_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ApplicationBasicCluster) cluster)
+                          .changeStatus((DefaultClusterCallback) callback
+                          ,  applicationBasic_changeStatus_commandParams.get("status") commandArguments.get("status")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   applicationBasic_changeStatus_commandParams
+           );
+           applicationBasic_ClusterCommandInfo.put("changeStatus", applicationBasic_changeStatus_CommandInfo);
+     // Populate cluster
+     ClusterInfo applicationBasic_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId), applicationBasic_ClusterCommandInfo);
+     clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
+     Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> applicationLauncher_launchApp_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter applicationLauncher_launchApp_commandParameter = new CommandParameter("ApplicationLauncher", ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
+                 CommandParameter applicationLauncher_launchApp_data_commandParameter = new CommandParameter("data", String.class);
+                 applicationLauncher_launchApp_commandParams.put("data",applicationLauncher_launchApp_data_commandParameter);
+                  
+                 CommandParameter applicationLauncher_launchApp_catalogVendorId_commandParameter = new CommandParameter("catalogVendorId", int.class);
+                 applicationLauncher_launchApp_commandParams.put("catalogVendorId",applicationLauncher_launchApp_catalogVendorId_commandParameter);
+                  
+                 CommandParameter applicationLauncher_launchApp_applicationId_commandParameter = new CommandParameter("applicationId", String.class);
+                 applicationLauncher_launchApp_commandParams.put("applicationId",applicationLauncher_launchApp_applicationId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo applicationLauncher_launchApp_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ApplicationLauncherCluster) cluster)
+                           .launchApp((ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback) callback
+                           ,  applicationLauncher_launchApp_commandParams.get("data") commandArguments.get("data")
+                           ,  applicationLauncher_launchApp_commandParams.get("catalogVendorId") commandArguments.get("catalogVendorId")
+                           ,  applicationLauncher_launchApp_commandParams.get("applicationId") commandArguments.get("applicationId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   applicationLauncher_launchApp_commandParams
+           );
+           applicationLauncher_ClusterCommandInfo.put("launchApp", applicationLauncher_launchApp_CommandInfo);
+     // Populate cluster
+     ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId), applicationLauncher_ClusterCommandInfo);
+     clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
+     Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> audioOutput_renameOutput_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter audioOutput_renameOutput_commandParameter = new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter audioOutput_renameOutput_index_commandParameter = new CommandParameter("index", int.class);
+                 audioOutput_renameOutput_commandParams.put("index",audioOutput_renameOutput_index_commandParameter);
+                  
+                 CommandParameter audioOutput_renameOutput_name_commandParameter = new CommandParameter("name", String.class);
+                 audioOutput_renameOutput_commandParams.put("name",audioOutput_renameOutput_name_commandParameter);
+                 
+           // Populate commands
+           CommandInfo audioOutput_renameOutput_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AudioOutputCluster) cluster)
+                          .renameOutput((DefaultClusterCallback) callback
+                          ,  audioOutput_renameOutput_commandParams.get("index") commandArguments.get("index")
+                          ,  audioOutput_renameOutput_commandParams.get("name") commandArguments.get("name")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   audioOutput_renameOutput_commandParams
+           );
+           audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
+           Map<String, CommandParameter> audioOutput_selectOutput_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter audioOutput_selectOutput_commandParameter = new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter audioOutput_selectOutput_index_commandParameter = new CommandParameter("index", int.class);
+                 audioOutput_selectOutput_commandParams.put("index",audioOutput_selectOutput_index_commandParameter);
+                 
+           // Populate commands
+           CommandInfo audioOutput_selectOutput_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.AudioOutputCluster) cluster)
+                          .selectOutput((DefaultClusterCallback) callback
+                          ,  audioOutput_selectOutput_commandParams.get("index") commandArguments.get("index")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   audioOutput_selectOutput_commandParams
+           );
+           audioOutput_ClusterCommandInfo.put("selectOutput", audioOutput_selectOutput_CommandInfo);
+     // Populate cluster
+     ClusterInfo audioOutput_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId), audioOutput_ClusterCommandInfo);
+     clusterMap.put("audioOutput", audioOutput_clusterInfo);
+     Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> barrierControl_barrierControlGoToPercent_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter barrierControl_barrierControlGoToPercent_commandParameter = new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter barrierControl_barrierControlGoToPercent_percentOpen_commandParameter = new CommandParameter("percentOpen", int.class);
+                 barrierControl_barrierControlGoToPercent_commandParams.put("percentOpen",barrierControl_barrierControlGoToPercent_percentOpen_commandParameter);
+                 
+           // Populate commands
+           CommandInfo barrierControl_barrierControlGoToPercent_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.BarrierControlCluster) cluster)
+                          .barrierControlGoToPercent((DefaultClusterCallback) callback
+                          ,  barrierControl_barrierControlGoToPercent_commandParams.get("percentOpen") commandArguments.get("percentOpen")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   barrierControl_barrierControlGoToPercent_commandParams
+           );
+           barrierControl_ClusterCommandInfo.put("barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
+           Map<String, CommandParameter> barrierControl_barrierControlStop_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter barrierControl_barrierControlStop_commandParameter = new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo barrierControl_barrierControlStop_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.BarrierControlCluster) cluster)
+                          .barrierControlStop((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   barrierControl_barrierControlStop_commandParams
+           );
+           barrierControl_ClusterCommandInfo.put("barrierControlStop", barrierControl_barrierControlStop_CommandInfo);
+     // Populate cluster
+     ClusterInfo barrierControl_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId), barrierControl_ClusterCommandInfo);
+     clusterMap.put("barrierControl", barrierControl_clusterInfo);
+     Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> basic_mfgSpecificPing_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter basic_mfgSpecificPing_commandParameter = new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo basic_mfgSpecificPing_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.BasicCluster) cluster)
+                          .mfgSpecificPing((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   basic_mfgSpecificPing_commandParams
+           );
+           basic_ClusterCommandInfo.put("mfgSpecificPing", basic_mfgSpecificPing_CommandInfo);
+     // Populate cluster
+     ClusterInfo basic_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId), basic_ClusterCommandInfo);
+     clusterMap.put("basic", basic_clusterInfo);
+     Map<String, CommandInfo> binaryInputBasic_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId), binaryInputBasic_ClusterCommandInfo);
+     clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
+     Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> binding_bind_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter binding_bind_commandParameter = new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter binding_bind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+                 binding_bind_commandParams.put("nodeId",binding_bind_nodeId_commandParameter);
+                  
+                 CommandParameter binding_bind_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 binding_bind_commandParams.put("groupId",binding_bind_groupId_commandParameter);
+                  
+                 CommandParameter binding_bind_endpointId_commandParameter = new CommandParameter("endpointId", int.class);
+                 binding_bind_commandParams.put("endpointId",binding_bind_endpointId_commandParameter);
+                  
+                 CommandParameter binding_bind_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+                 binding_bind_commandParams.put("clusterId",binding_bind_clusterId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo binding_bind_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.BindingCluster) cluster)
+                          .bind((DefaultClusterCallback) callback
+                          ,  binding_bind_commandParams.get("nodeId") commandArguments.get("nodeId")
+                          ,  binding_bind_commandParams.get("groupId") commandArguments.get("groupId")
+                          ,  binding_bind_commandParams.get("endpointId") commandArguments.get("endpointId")
+                          ,  binding_bind_commandParams.get("clusterId") commandArguments.get("clusterId")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   binding_bind_commandParams
+           );
+           binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
+           Map<String, CommandParameter> binding_unbind_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter binding_unbind_commandParameter = new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter binding_unbind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
+                 binding_unbind_commandParams.put("nodeId",binding_unbind_nodeId_commandParameter);
+                  
+                 CommandParameter binding_unbind_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 binding_unbind_commandParams.put("groupId",binding_unbind_groupId_commandParameter);
+                  
+                 CommandParameter binding_unbind_endpointId_commandParameter = new CommandParameter("endpointId", int.class);
+                 binding_unbind_commandParams.put("endpointId",binding_unbind_endpointId_commandParameter);
+                  
+                 CommandParameter binding_unbind_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+                 binding_unbind_commandParams.put("clusterId",binding_unbind_clusterId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo binding_unbind_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.BindingCluster) cluster)
+                          .unbind((DefaultClusterCallback) callback
+                          ,  binding_unbind_commandParams.get("nodeId") commandArguments.get("nodeId")
+                          ,  binding_unbind_commandParams.get("groupId") commandArguments.get("groupId")
+                          ,  binding_unbind_commandParams.get("endpointId") commandArguments.get("endpointId")
+                          ,  binding_unbind_commandParams.get("clusterId") commandArguments.get("clusterId")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   binding_unbind_commandParams
+           );
+           binding_ClusterCommandInfo.put("unbind", binding_unbind_CommandInfo);
+     // Populate cluster
+     ClusterInfo binding_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId), binding_ClusterCommandInfo);
+     clusterMap.put("binding", binding_clusterInfo);
+     Map<String, CommandInfo> bridgedDeviceBasic_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId), bridgedDeviceBasic_ClusterCommandInfo);
+     clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
+     Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> colorControl_colorLoopSet_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_colorLoopSet_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_colorLoopSet_updateFlags_commandParameter = new CommandParameter("updateFlags", int.class);
+                 colorControl_colorLoopSet_commandParams.put("updateFlags",colorControl_colorLoopSet_updateFlags_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_action_commandParameter = new CommandParameter("action", int.class);
+                 colorControl_colorLoopSet_commandParams.put("action",colorControl_colorLoopSet_action_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_direction_commandParameter = new CommandParameter("direction", int.class);
+                 colorControl_colorLoopSet_commandParams.put("direction",colorControl_colorLoopSet_direction_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_time_commandParameter = new CommandParameter("time", int.class);
+                 colorControl_colorLoopSet_commandParams.put("time",colorControl_colorLoopSet_time_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_startHue_commandParameter = new CommandParameter("startHue", int.class);
+                 colorControl_colorLoopSet_commandParams.put("startHue",colorControl_colorLoopSet_startHue_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_colorLoopSet_commandParams.put("optionsMask",colorControl_colorLoopSet_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_colorLoopSet_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_colorLoopSet_commandParams.put("optionsOverride",colorControl_colorLoopSet_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_colorLoopSet_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .colorLoopSet((DefaultClusterCallback) callback
+                          ,  colorControl_colorLoopSet_commandParams.get("updateFlags") commandArguments.get("updateFlags")
+                          ,  colorControl_colorLoopSet_commandParams.get("action") commandArguments.get("action")
+                          ,  colorControl_colorLoopSet_commandParams.get("direction") commandArguments.get("direction")
+                          ,  colorControl_colorLoopSet_commandParams.get("time") commandArguments.get("time")
+                          ,  colorControl_colorLoopSet_commandParams.get("startHue") commandArguments.get("startHue")
+                          ,  colorControl_colorLoopSet_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_colorLoopSet_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_colorLoopSet_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
+           Map<String, CommandParameter> colorControl_enhancedMoveHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_enhancedMoveHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_enhancedMoveHue_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 colorControl_enhancedMoveHue_commandParams.put("moveMode",colorControl_enhancedMoveHue_moveMode_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveHue_rate_commandParameter = new CommandParameter("rate", int.class);
+                 colorControl_enhancedMoveHue_commandParams.put("rate",colorControl_enhancedMoveHue_rate_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_enhancedMoveHue_commandParams.put("optionsMask",colorControl_enhancedMoveHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_enhancedMoveHue_commandParams.put("optionsOverride",colorControl_enhancedMoveHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_enhancedMoveHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .enhancedMoveHue((DefaultClusterCallback) callback
+                          ,  colorControl_enhancedMoveHue_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  colorControl_enhancedMoveHue_commandParams.get("rate") commandArguments.get("rate")
+                          ,  colorControl_enhancedMoveHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_enhancedMoveHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_enhancedMoveHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_enhancedMoveToHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_enhancedMoveToHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_enhancedMoveToHue_enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
+                 colorControl_enhancedMoveToHue_commandParams.put("enhancedHue",colorControl_enhancedMoveToHue_enhancedHue_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHue_direction_commandParameter = new CommandParameter("direction", int.class);
+                 colorControl_enhancedMoveToHue_commandParams.put("direction",colorControl_enhancedMoveToHue_direction_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_enhancedMoveToHue_commandParams.put("transitionTime",colorControl_enhancedMoveToHue_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_enhancedMoveToHue_commandParams.put("optionsMask",colorControl_enhancedMoveToHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_enhancedMoveToHue_commandParams.put("optionsOverride",colorControl_enhancedMoveToHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_enhancedMoveToHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .enhancedMoveToHue((DefaultClusterCallback) callback
+                          ,  colorControl_enhancedMoveToHue_commandParams.get("enhancedHue") commandArguments.get("enhancedHue")
+                          ,  colorControl_enhancedMoveToHue_commandParams.get("direction") commandArguments.get("direction")
+                          ,  colorControl_enhancedMoveToHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_enhancedMoveToHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_enhancedMoveToHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_enhancedMoveToHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
+                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("enhancedHue",colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
+                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("saturation",colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("transitionTime",colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("optionsMask",colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("optionsOverride",colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_enhancedMoveToHueAndSaturation_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .enhancedMoveToHueAndSaturation((DefaultClusterCallback) callback
+                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("enhancedHue") commandArguments.get("enhancedHue")
+                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("saturation") commandArguments.get("saturation")
+                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_enhancedMoveToHueAndSaturation_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
+           Map<String, CommandParameter> colorControl_enhancedStepHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_enhancedStepHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_enhancedStepHue_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 colorControl_enhancedStepHue_commandParams.put("stepMode",colorControl_enhancedStepHue_stepMode_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedStepHue_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 colorControl_enhancedStepHue_commandParams.put("stepSize",colorControl_enhancedStepHue_stepSize_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedStepHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_enhancedStepHue_commandParams.put("transitionTime",colorControl_enhancedStepHue_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedStepHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_enhancedStepHue_commandParams.put("optionsMask",colorControl_enhancedStepHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_enhancedStepHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_enhancedStepHue_commandParams.put("optionsOverride",colorControl_enhancedStepHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_enhancedStepHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .enhancedStepHue((DefaultClusterCallback) callback
+                          ,  colorControl_enhancedStepHue_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  colorControl_enhancedStepHue_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  colorControl_enhancedStepHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_enhancedStepHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_enhancedStepHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_enhancedStepHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveColor_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveColor_rateX_commandParameter = new CommandParameter("rateX", int.class);
+                 colorControl_moveColor_commandParams.put("rateX",colorControl_moveColor_rateX_commandParameter);
+                  
+                 CommandParameter colorControl_moveColor_rateY_commandParameter = new CommandParameter("rateY", int.class);
+                 colorControl_moveColor_commandParams.put("rateY",colorControl_moveColor_rateY_commandParameter);
+                  
+                 CommandParameter colorControl_moveColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveColor_commandParams.put("optionsMask",colorControl_moveColor_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveColor_commandParams.put("optionsOverride",colorControl_moveColor_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveColor_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveColor((DefaultClusterCallback) callback
+                          ,  colorControl_moveColor_commandParams.get("rateX") commandArguments.get("rateX")
+                          ,  colorControl_moveColor_commandParams.get("rateY") commandArguments.get("rateY")
+                          ,  colorControl_moveColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveColor_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveColorTemperature_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveColorTemperature_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("moveMode",colorControl_moveColorTemperature_moveMode_commandParameter);
+                  
+                 CommandParameter colorControl_moveColorTemperature_rate_commandParameter = new CommandParameter("rate", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("rate",colorControl_moveColorTemperature_rate_commandParameter);
+                  
+                 CommandParameter colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter = new CommandParameter("colorTemperatureMinimum", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("colorTemperatureMinimum",colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter);
+                  
+                 CommandParameter colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter = new CommandParameter("colorTemperatureMaximum", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("colorTemperatureMaximum",colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter);
+                  
+                 CommandParameter colorControl_moveColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("optionsMask",colorControl_moveColorTemperature_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveColorTemperature_commandParams.put("optionsOverride",colorControl_moveColorTemperature_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveColorTemperature_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveColorTemperature((DefaultClusterCallback) callback
+                          ,  colorControl_moveColorTemperature_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  colorControl_moveColorTemperature_commandParams.get("rate") commandArguments.get("rate")
+                          ,  colorControl_moveColorTemperature_commandParams.get("colorTemperatureMinimum") commandArguments.get("colorTemperatureMinimum")
+                          ,  colorControl_moveColorTemperature_commandParams.get("colorTemperatureMaximum") commandArguments.get("colorTemperatureMaximum")
+                          ,  colorControl_moveColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveColorTemperature_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveHue_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 colorControl_moveHue_commandParams.put("moveMode",colorControl_moveHue_moveMode_commandParameter);
+                  
+                 CommandParameter colorControl_moveHue_rate_commandParameter = new CommandParameter("rate", int.class);
+                 colorControl_moveHue_commandParams.put("rate",colorControl_moveHue_rate_commandParameter);
+                  
+                 CommandParameter colorControl_moveHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveHue_commandParams.put("optionsMask",colorControl_moveHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveHue_commandParams.put("optionsOverride",colorControl_moveHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveHue((DefaultClusterCallback) callback
+                          ,  colorControl_moveHue_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  colorControl_moveHue_commandParams.get("rate") commandArguments.get("rate")
+                          ,  colorControl_moveHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveSaturation_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveSaturation_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 colorControl_moveSaturation_commandParams.put("moveMode",colorControl_moveSaturation_moveMode_commandParameter);
+                  
+                 CommandParameter colorControl_moveSaturation_rate_commandParameter = new CommandParameter("rate", int.class);
+                 colorControl_moveSaturation_commandParams.put("rate",colorControl_moveSaturation_rate_commandParameter);
+                  
+                 CommandParameter colorControl_moveSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveSaturation_commandParams.put("optionsMask",colorControl_moveSaturation_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveSaturation_commandParams.put("optionsOverride",colorControl_moveSaturation_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveSaturation_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveSaturation((DefaultClusterCallback) callback
+                          ,  colorControl_moveSaturation_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  colorControl_moveSaturation_commandParams.get("rate") commandArguments.get("rate")
+                          ,  colorControl_moveSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveSaturation_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveToColor_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveToColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveToColor_colorX_commandParameter = new CommandParameter("colorX", int.class);
+                 colorControl_moveToColor_commandParams.put("colorX",colorControl_moveToColor_colorX_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColor_colorY_commandParameter = new CommandParameter("colorY", int.class);
+                 colorControl_moveToColor_commandParams.put("colorY",colorControl_moveToColor_colorY_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColor_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_moveToColor_commandParams.put("transitionTime",colorControl_moveToColor_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveToColor_commandParams.put("optionsMask",colorControl_moveToColor_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveToColor_commandParams.put("optionsOverride",colorControl_moveToColor_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveToColor_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveToColor((DefaultClusterCallback) callback
+                          ,  colorControl_moveToColor_commandParams.get("colorX") commandArguments.get("colorX")
+                          ,  colorControl_moveToColor_commandParams.get("colorY") commandArguments.get("colorY")
+                          ,  colorControl_moveToColor_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_moveToColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveToColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveToColor_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveToColorTemperature_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveToColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveToColorTemperature_colorTemperature_commandParameter = new CommandParameter("colorTemperature", int.class);
+                 colorControl_moveToColorTemperature_commandParams.put("colorTemperature",colorControl_moveToColorTemperature_colorTemperature_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColorTemperature_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_moveToColorTemperature_commandParams.put("transitionTime",colorControl_moveToColorTemperature_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveToColorTemperature_commandParams.put("optionsMask",colorControl_moveToColorTemperature_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveToColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveToColorTemperature_commandParams.put("optionsOverride",colorControl_moveToColorTemperature_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveToColorTemperature_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveToColorTemperature((DefaultClusterCallback) callback
+                          ,  colorControl_moveToColorTemperature_commandParams.get("colorTemperature") commandArguments.get("colorTemperature")
+                          ,  colorControl_moveToColorTemperature_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_moveToColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveToColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveToColorTemperature_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveToHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveToHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveToHue_hue_commandParameter = new CommandParameter("hue", int.class);
+                 colorControl_moveToHue_commandParams.put("hue",colorControl_moveToHue_hue_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHue_direction_commandParameter = new CommandParameter("direction", int.class);
+                 colorControl_moveToHue_commandParams.put("direction",colorControl_moveToHue_direction_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_moveToHue_commandParams.put("transitionTime",colorControl_moveToHue_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveToHue_commandParams.put("optionsMask",colorControl_moveToHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveToHue_commandParams.put("optionsOverride",colorControl_moveToHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveToHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveToHue((DefaultClusterCallback) callback
+                          ,  colorControl_moveToHue_commandParams.get("hue") commandArguments.get("hue")
+                          ,  colorControl_moveToHue_commandParams.get("direction") commandArguments.get("direction")
+                          ,  colorControl_moveToHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_moveToHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveToHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveToHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveToHueAndSaturation_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveToHueAndSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveToHueAndSaturation_hue_commandParameter = new CommandParameter("hue", int.class);
+                 colorControl_moveToHueAndSaturation_commandParams.put("hue",colorControl_moveToHueAndSaturation_hue_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHueAndSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
+                 colorControl_moveToHueAndSaturation_commandParams.put("saturation",colorControl_moveToHueAndSaturation_saturation_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHueAndSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_moveToHueAndSaturation_commandParams.put("transitionTime",colorControl_moveToHueAndSaturation_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHueAndSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveToHueAndSaturation_commandParams.put("optionsMask",colorControl_moveToHueAndSaturation_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveToHueAndSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveToHueAndSaturation_commandParams.put("optionsOverride",colorControl_moveToHueAndSaturation_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveToHueAndSaturation_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveToHueAndSaturation((DefaultClusterCallback) callback
+                          ,  colorControl_moveToHueAndSaturation_commandParams.get("hue") commandArguments.get("hue")
+                          ,  colorControl_moveToHueAndSaturation_commandParams.get("saturation") commandArguments.get("saturation")
+                          ,  colorControl_moveToHueAndSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_moveToHueAndSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveToHueAndSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveToHueAndSaturation_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
+           Map<String, CommandParameter> colorControl_moveToSaturation_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_moveToSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_moveToSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
+                 colorControl_moveToSaturation_commandParams.put("saturation",colorControl_moveToSaturation_saturation_commandParameter);
+                  
+                 CommandParameter colorControl_moveToSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_moveToSaturation_commandParams.put("transitionTime",colorControl_moveToSaturation_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_moveToSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_moveToSaturation_commandParams.put("optionsMask",colorControl_moveToSaturation_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_moveToSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_moveToSaturation_commandParams.put("optionsOverride",colorControl_moveToSaturation_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_moveToSaturation_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .moveToSaturation((DefaultClusterCallback) callback
+                          ,  colorControl_moveToSaturation_commandParams.get("saturation") commandArguments.get("saturation")
+                          ,  colorControl_moveToSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_moveToSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_moveToSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_moveToSaturation_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("moveToSaturation", colorControl_moveToSaturation_CommandInfo);
+           Map<String, CommandParameter> colorControl_stepColor_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_stepColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_stepColor_stepX_commandParameter = new CommandParameter("stepX", int.class);
+                 colorControl_stepColor_commandParams.put("stepX",colorControl_stepColor_stepX_commandParameter);
+                  
+                 CommandParameter colorControl_stepColor_stepY_commandParameter = new CommandParameter("stepY", int.class);
+                 colorControl_stepColor_commandParams.put("stepY",colorControl_stepColor_stepY_commandParameter);
+                  
+                 CommandParameter colorControl_stepColor_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_stepColor_commandParams.put("transitionTime",colorControl_stepColor_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_stepColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_stepColor_commandParams.put("optionsMask",colorControl_stepColor_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_stepColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_stepColor_commandParams.put("optionsOverride",colorControl_stepColor_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_stepColor_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .stepColor((DefaultClusterCallback) callback
+                          ,  colorControl_stepColor_commandParams.get("stepX") commandArguments.get("stepX")
+                          ,  colorControl_stepColor_commandParams.get("stepY") commandArguments.get("stepY")
+                          ,  colorControl_stepColor_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_stepColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_stepColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_stepColor_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
+           Map<String, CommandParameter> colorControl_stepColorTemperature_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_stepColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_stepColorTemperature_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("stepMode",colorControl_stepColorTemperature_stepMode_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("stepSize",colorControl_stepColorTemperature_stepSize_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("transitionTime",colorControl_stepColorTemperature_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter = new CommandParameter("colorTemperatureMinimum", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("colorTemperatureMinimum",colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter = new CommandParameter("colorTemperatureMaximum", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("colorTemperatureMaximum",colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("optionsMask",colorControl_stepColorTemperature_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_stepColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_stepColorTemperature_commandParams.put("optionsOverride",colorControl_stepColorTemperature_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_stepColorTemperature_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .stepColorTemperature((DefaultClusterCallback) callback
+                          ,  colorControl_stepColorTemperature_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  colorControl_stepColorTemperature_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  colorControl_stepColorTemperature_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_stepColorTemperature_commandParams.get("colorTemperatureMinimum") commandArguments.get("colorTemperatureMinimum")
+                          ,  colorControl_stepColorTemperature_commandParams.get("colorTemperatureMaximum") commandArguments.get("colorTemperatureMaximum")
+                          ,  colorControl_stepColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_stepColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_stepColorTemperature_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
+           Map<String, CommandParameter> colorControl_stepHue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_stepHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_stepHue_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 colorControl_stepHue_commandParams.put("stepMode",colorControl_stepHue_stepMode_commandParameter);
+                  
+                 CommandParameter colorControl_stepHue_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 colorControl_stepHue_commandParams.put("stepSize",colorControl_stepHue_stepSize_commandParameter);
+                  
+                 CommandParameter colorControl_stepHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_stepHue_commandParams.put("transitionTime",colorControl_stepHue_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_stepHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_stepHue_commandParams.put("optionsMask",colorControl_stepHue_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_stepHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_stepHue_commandParams.put("optionsOverride",colorControl_stepHue_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_stepHue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .stepHue((DefaultClusterCallback) callback
+                          ,  colorControl_stepHue_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  colorControl_stepHue_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  colorControl_stepHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_stepHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_stepHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_stepHue_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
+           Map<String, CommandParameter> colorControl_stepSaturation_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_stepSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_stepSaturation_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 colorControl_stepSaturation_commandParams.put("stepMode",colorControl_stepSaturation_stepMode_commandParameter);
+                  
+                 CommandParameter colorControl_stepSaturation_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 colorControl_stepSaturation_commandParams.put("stepSize",colorControl_stepSaturation_stepSize_commandParameter);
+                  
+                 CommandParameter colorControl_stepSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 colorControl_stepSaturation_commandParams.put("transitionTime",colorControl_stepSaturation_transitionTime_commandParameter);
+                  
+                 CommandParameter colorControl_stepSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_stepSaturation_commandParams.put("optionsMask",colorControl_stepSaturation_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_stepSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_stepSaturation_commandParams.put("optionsOverride",colorControl_stepSaturation_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_stepSaturation_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .stepSaturation((DefaultClusterCallback) callback
+                          ,  colorControl_stepSaturation_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  colorControl_stepSaturation_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  colorControl_stepSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  colorControl_stepSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_stepSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_stepSaturation_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
+           Map<String, CommandParameter> colorControl_stopMoveStep_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter colorControl_stopMoveStep_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter colorControl_stopMoveStep_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
+                 colorControl_stopMoveStep_commandParams.put("optionsMask",colorControl_stopMoveStep_optionsMask_commandParameter);
+                  
+                 CommandParameter colorControl_stopMoveStep_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
+                 colorControl_stopMoveStep_commandParams.put("optionsOverride",colorControl_stopMoveStep_optionsOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo colorControl_stopMoveStep_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ColorControlCluster) cluster)
+                          .stopMoveStep((DefaultClusterCallback) callback
+                          ,  colorControl_stopMoveStep_commandParams.get("optionsMask") commandArguments.get("optionsMask")
+                          ,  colorControl_stopMoveStep_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   colorControl_stopMoveStep_commandParams
+           );
+           colorControl_ClusterCommandInfo.put("stopMoveStep", colorControl_stopMoveStep_CommandInfo);
+     // Populate cluster
+     ClusterInfo colorControl_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId), colorControl_ClusterCommandInfo);
+     clusterMap.put("colorControl", colorControl_clusterInfo);
+     Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> contentLauncher_launchContent_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter contentLauncher_launchContent_commandParameter = new CommandParameter("ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
+                 CommandParameter contentLauncher_launchContent_autoPlay_commandParameter = new CommandParameter("autoPlay", boolean.class);
+                 contentLauncher_launchContent_commandParams.put("autoPlay",contentLauncher_launchContent_autoPlay_commandParameter);
+                  
+                 CommandParameter contentLauncher_launchContent_data_commandParameter = new CommandParameter("data", String.class);
+                 contentLauncher_launchContent_commandParams.put("data",contentLauncher_launchContent_data_commandParameter);
+                 
+           // Populate commands
+           CommandInfo contentLauncher_launchContent_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ContentLauncherCluster) cluster)
+                           .launchContent((ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback) callback
+                           ,  contentLauncher_launchContent_commandParams.get("autoPlay") commandArguments.get("autoPlay")
+                           ,  contentLauncher_launchContent_commandParams.get("data") commandArguments.get("data")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   contentLauncher_launchContent_commandParams
+           );
+           contentLauncher_ClusterCommandInfo.put("launchContent", contentLauncher_launchContent_CommandInfo);
+           Map<String, CommandParameter> contentLauncher_launchURL_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter contentLauncher_launchURL_commandParameter = new CommandParameter("ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
+                 CommandParameter contentLauncher_launchURL_contentURL_commandParameter = new CommandParameter("contentURL", String.class);
+                 contentLauncher_launchURL_commandParams.put("contentURL",contentLauncher_launchURL_contentURL_commandParameter);
+                  
+                 CommandParameter contentLauncher_launchURL_displayString_commandParameter = new CommandParameter("displayString", String.class);
+                 contentLauncher_launchURL_commandParams.put("displayString",contentLauncher_launchURL_displayString_commandParameter);
+                 
+           // Populate commands
+           CommandInfo contentLauncher_launchURL_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ContentLauncherCluster) cluster)
+                           .launchURL((ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback) callback
+                           ,  contentLauncher_launchURL_commandParams.get("contentURL") commandArguments.get("contentURL")
+                           ,  contentLauncher_launchURL_commandParams.get("displayString") commandArguments.get("displayString")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   contentLauncher_launchURL_commandParams
+           );
+           contentLauncher_ClusterCommandInfo.put("launchURL", contentLauncher_launchURL_CommandInfo);
+     // Populate cluster
+     ClusterInfo contentLauncher_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId), contentLauncher_ClusterCommandInfo);
+     clusterMap.put("contentLauncher", contentLauncher_clusterInfo);
+     Map<String, CommandInfo> descriptor_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo descriptor_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId), descriptor_ClusterCommandInfo);
+     clusterMap.put("descriptor", descriptor_clusterInfo);
+     Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter diagnosticLogs_retrieveLogsRequest_commandParameter = new CommandParameter("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter diagnosticLogs_retrieveLogsRequest_intent_commandParameter = new CommandParameter("intent", int.class);
+                 diagnosticLogs_retrieveLogsRequest_commandParams.put("intent",diagnosticLogs_retrieveLogsRequest_intent_commandParameter);
+                  
+                 CommandParameter diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter = new CommandParameter("requestedProtocol", int.class);
+                 diagnosticLogs_retrieveLogsRequest_commandParams.put("requestedProtocol",diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter);
+                  
+                 CommandParameter diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter = new CommandParameter("transferFileDesignator", byte[].class);
+                 diagnosticLogs_retrieveLogsRequest_commandParams.put("transferFileDesignator",diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
+                 
+           // Populate commands
+           CommandInfo diagnosticLogs_retrieveLogsRequest_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DiagnosticLogsCluster) cluster)
+                          .retrieveLogsRequest((DefaultClusterCallback) callback
+                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("intent") commandArguments.get("intent")
+                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("requestedProtocol") commandArguments.get("requestedProtocol")
+                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("transferFileDesignator") commandArguments.get("transferFileDesignator")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   diagnosticLogs_retrieveLogsRequest_commandParams
+           );
+           diagnosticLogs_ClusterCommandInfo.put("retrieveLogsRequest", diagnosticLogs_retrieveLogsRequest_CommandInfo);
+     // Populate cluster
+     ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId), diagnosticLogs_ClusterCommandInfo);
+     clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
+     Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> doorLock_clearAllPins_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearAllPins_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
+           // Populate commands
+           CommandInfo doorLock_clearAllPins_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearAllPins((ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearAllPins_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearAllRfids_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearAllRfids_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
+           // Populate commands
+           CommandInfo doorLock_clearAllRfids_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearAllRfids((ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearAllRfids_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
+                 CommandParameter doorLock_clearHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_clearHolidaySchedule_commandParams.put("scheduleId",doorLock_clearHolidaySchedule_scheduleId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_clearHolidaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearHolidaySchedule((ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback) callback
+                           ,  doorLock_clearHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearHolidaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearHolidaySchedule", doorLock_clearHolidaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearPin_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
+                 CommandParameter doorLock_clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_clearPin_commandParams.put("userId",doorLock_clearPin_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_clearPin_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearPin((ChipClusters.DoorLockCluster.ClearPinResponseCallback) callback
+                           ,  doorLock_clearPin_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearPin_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearRfid_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
+                 CommandParameter doorLock_clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_clearRfid_commandParams.put("userId",doorLock_clearRfid_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_clearRfid_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearRfid((ChipClusters.DoorLockCluster.ClearRfidResponseCallback) callback
+                           ,  doorLock_clearRfid_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearRfid_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
+                 CommandParameter doorLock_clearWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_clearWeekdaySchedule_commandParams.put("scheduleId",doorLock_clearWeekdaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_clearWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_clearWeekdaySchedule_commandParams.put("userId",doorLock_clearWeekdaySchedule_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_clearWeekdaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearWeekdaySchedule((ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback) callback
+                           ,  doorLock_clearWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_clearWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearWeekdaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearWeekdaySchedule", doorLock_clearWeekdaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_clearYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_clearYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
+                 CommandParameter doorLock_clearYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_clearYeardaySchedule_commandParams.put("scheduleId",doorLock_clearYeardaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_clearYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_clearYeardaySchedule_commandParams.put("userId",doorLock_clearYeardaySchedule_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_clearYeardaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .clearYeardaySchedule((ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback) callback
+                           ,  doorLock_clearYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_clearYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_clearYeardaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("clearYeardaySchedule", doorLock_clearYeardaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_getHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
+                 CommandParameter doorLock_getHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_getHolidaySchedule_commandParams.put("scheduleId",doorLock_getHolidaySchedule_scheduleId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getHolidaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getHolidaySchedule((ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback
+                           ,  doorLock_getHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getHolidaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_getLogRecord_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getLogRecord_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
+                 CommandParameter doorLock_getLogRecord_logIndex_commandParameter = new CommandParameter("logIndex", int.class);
+                 doorLock_getLogRecord_commandParams.put("logIndex",doorLock_getLogRecord_logIndex_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getLogRecord_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getLogRecord((ChipClusters.DoorLockCluster.GetLogRecordResponseCallback) callback
+                           ,  doorLock_getLogRecord_commandParams.get("logIndex") commandArguments.get("logIndex")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getLogRecord_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
+           Map<String, CommandParameter> doorLock_getPin_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
+                 CommandParameter doorLock_getPin_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_getPin_commandParams.put("userId",doorLock_getPin_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getPin_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getPin((ChipClusters.DoorLockCluster.GetPinResponseCallback) callback
+                           ,  doorLock_getPin_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getPin_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
+           Map<String, CommandParameter> doorLock_getRfid_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
+                 CommandParameter doorLock_getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_getRfid_commandParams.put("userId",doorLock_getRfid_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getRfid_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getRfid((ChipClusters.DoorLockCluster.GetRfidResponseCallback) callback
+                           ,  doorLock_getRfid_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getRfid_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
+           Map<String, CommandParameter> doorLock_getUserType_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getUserType_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
+                 CommandParameter doorLock_getUserType_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_getUserType_commandParams.put("userId",doorLock_getUserType_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getUserType_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getUserType((ChipClusters.DoorLockCluster.GetUserTypeResponseCallback) callback
+                           ,  doorLock_getUserType_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getUserType_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
+           Map<String, CommandParameter> doorLock_getWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
+                 CommandParameter doorLock_getWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_getWeekdaySchedule_commandParams.put("scheduleId",doorLock_getWeekdaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_getWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_getWeekdaySchedule_commandParams.put("userId",doorLock_getWeekdaySchedule_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getWeekdaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getWeekdaySchedule((ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback) callback
+                           ,  doorLock_getWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_getWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getWeekdaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_getYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_getYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
+                 CommandParameter doorLock_getYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_getYeardaySchedule_commandParams.put("scheduleId",doorLock_getYeardaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_getYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_getYeardaySchedule_commandParams.put("userId",doorLock_getYeardaySchedule_userId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_getYeardaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .getYeardaySchedule((ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback) callback
+                           ,  doorLock_getYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_getYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_getYeardaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_lockDoor_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_lockDoor_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
+                 CommandParameter doorLock_lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
+                 doorLock_lockDoor_commandParams.put("pin",doorLock_lockDoor_pin_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_lockDoor_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .lockDoor((ChipClusters.DoorLockCluster.LockDoorResponseCallback) callback
+                           ,  doorLock_lockDoor_commandParams.get("pin") commandArguments.get("pin")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_lockDoor_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
+           Map<String, CommandParameter> doorLock_setHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
+                 CommandParameter doorLock_setHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_setHolidaySchedule_commandParams.put("scheduleId",doorLock_setHolidaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_setHolidaySchedule_localStartTime_commandParameter = new CommandParameter("localStartTime", long.class);
+                 doorLock_setHolidaySchedule_commandParams.put("localStartTime",doorLock_setHolidaySchedule_localStartTime_commandParameter);
+                  
+                 CommandParameter doorLock_setHolidaySchedule_localEndTime_commandParameter = new CommandParameter("localEndTime", long.class);
+                 doorLock_setHolidaySchedule_commandParams.put("localEndTime",doorLock_setHolidaySchedule_localEndTime_commandParameter);
+                  
+                 CommandParameter doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter = new CommandParameter("operatingModeDuringHoliday", int.class);
+                 doorLock_setHolidaySchedule_commandParams.put("operatingModeDuringHoliday",doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setHolidaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setHolidaySchedule((ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback) callback
+                           ,  doorLock_setHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_setHolidaySchedule_commandParams.get("localStartTime") commandArguments.get("localStartTime")
+                           ,  doorLock_setHolidaySchedule_commandParams.get("localEndTime") commandArguments.get("localEndTime")
+                           ,  doorLock_setHolidaySchedule_commandParams.get("operatingModeDuringHoliday") commandArguments.get("operatingModeDuringHoliday")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setHolidaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_setPin_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
+                 CommandParameter doorLock_setPin_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_setPin_commandParams.put("userId",doorLock_setPin_userId_commandParameter);
+                  
+                 CommandParameter doorLock_setPin_userStatus_commandParameter = new CommandParameter("userStatus", int.class);
+                 doorLock_setPin_commandParams.put("userStatus",doorLock_setPin_userStatus_commandParameter);
+                  
+                 CommandParameter doorLock_setPin_userType_commandParameter = new CommandParameter("userType", int.class);
+                 doorLock_setPin_commandParams.put("userType",doorLock_setPin_userType_commandParameter);
+                  
+                 CommandParameter doorLock_setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
+                 doorLock_setPin_commandParams.put("pin",doorLock_setPin_pin_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setPin_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setPin((ChipClusters.DoorLockCluster.SetPinResponseCallback) callback
+                           ,  doorLock_setPin_commandParams.get("userId") commandArguments.get("userId")
+                           ,  doorLock_setPin_commandParams.get("userStatus") commandArguments.get("userStatus")
+                           ,  doorLock_setPin_commandParams.get("userType") commandArguments.get("userType")
+                           ,  doorLock_setPin_commandParams.get("pin") commandArguments.get("pin")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setPin_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
+           Map<String, CommandParameter> doorLock_setRfid_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
+                 CommandParameter doorLock_setRfid_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_setRfid_commandParams.put("userId",doorLock_setRfid_userId_commandParameter);
+                  
+                 CommandParameter doorLock_setRfid_userStatus_commandParameter = new CommandParameter("userStatus", int.class);
+                 doorLock_setRfid_commandParams.put("userStatus",doorLock_setRfid_userStatus_commandParameter);
+                  
+                 CommandParameter doorLock_setRfid_userType_commandParameter = new CommandParameter("userType", int.class);
+                 doorLock_setRfid_commandParams.put("userType",doorLock_setRfid_userType_commandParameter);
+                  
+                 CommandParameter doorLock_setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
+                 doorLock_setRfid_commandParams.put("id",doorLock_setRfid_id_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setRfid_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setRfid((ChipClusters.DoorLockCluster.SetRfidResponseCallback) callback
+                           ,  doorLock_setRfid_commandParams.get("userId") commandArguments.get("userId")
+                           ,  doorLock_setRfid_commandParams.get("userStatus") commandArguments.get("userStatus")
+                           ,  doorLock_setRfid_commandParams.get("userType") commandArguments.get("userType")
+                           ,  doorLock_setRfid_commandParams.get("id") commandArguments.get("id")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setRfid_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
+           Map<String, CommandParameter> doorLock_setUserType_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setUserType_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
+                 CommandParameter doorLock_setUserType_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_setUserType_commandParams.put("userId",doorLock_setUserType_userId_commandParameter);
+                  
+                 CommandParameter doorLock_setUserType_userType_commandParameter = new CommandParameter("userType", int.class);
+                 doorLock_setUserType_commandParams.put("userType",doorLock_setUserType_userType_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setUserType_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setUserType((ChipClusters.DoorLockCluster.SetUserTypeResponseCallback) callback
+                           ,  doorLock_setUserType_commandParams.get("userId") commandArguments.get("userId")
+                           ,  doorLock_setUserType_commandParams.get("userType") commandArguments.get("userType")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setUserType_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
+           Map<String, CommandParameter> doorLock_setWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
+                 CommandParameter doorLock_setWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("scheduleId",doorLock_setWeekdaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("userId",doorLock_setWeekdaySchedule_userId_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_daysMask_commandParameter = new CommandParameter("daysMask", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("daysMask",doorLock_setWeekdaySchedule_daysMask_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_startHour_commandParameter = new CommandParameter("startHour", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("startHour",doorLock_setWeekdaySchedule_startHour_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_startMinute_commandParameter = new CommandParameter("startMinute", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("startMinute",doorLock_setWeekdaySchedule_startMinute_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_endHour_commandParameter = new CommandParameter("endHour", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("endHour",doorLock_setWeekdaySchedule_endHour_commandParameter);
+                  
+                 CommandParameter doorLock_setWeekdaySchedule_endMinute_commandParameter = new CommandParameter("endMinute", int.class);
+                 doorLock_setWeekdaySchedule_commandParams.put("endMinute",doorLock_setWeekdaySchedule_endMinute_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setWeekdaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setWeekdaySchedule((ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback) callback
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("daysMask") commandArguments.get("daysMask")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("startHour") commandArguments.get("startHour")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("startMinute") commandArguments.get("startMinute")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("endHour") commandArguments.get("endHour")
+                           ,  doorLock_setWeekdaySchedule_commandParams.get("endMinute") commandArguments.get("endMinute")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setWeekdaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_setYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_setYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
+                 CommandParameter doorLock_setYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
+                 doorLock_setYeardaySchedule_commandParams.put("scheduleId",doorLock_setYeardaySchedule_scheduleId_commandParameter);
+                  
+                 CommandParameter doorLock_setYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
+                 doorLock_setYeardaySchedule_commandParams.put("userId",doorLock_setYeardaySchedule_userId_commandParameter);
+                  
+                 CommandParameter doorLock_setYeardaySchedule_localStartTime_commandParameter = new CommandParameter("localStartTime", long.class);
+                 doorLock_setYeardaySchedule_commandParams.put("localStartTime",doorLock_setYeardaySchedule_localStartTime_commandParameter);
+                  
+                 CommandParameter doorLock_setYeardaySchedule_localEndTime_commandParameter = new CommandParameter("localEndTime", long.class);
+                 doorLock_setYeardaySchedule_commandParams.put("localEndTime",doorLock_setYeardaySchedule_localEndTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_setYeardaySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .setYeardaySchedule((ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback) callback
+                           ,  doorLock_setYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
+                           ,  doorLock_setYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
+                           ,  doorLock_setYeardaySchedule_commandParams.get("localStartTime") commandArguments.get("localStartTime")
+                           ,  doorLock_setYeardaySchedule_commandParams.get("localEndTime") commandArguments.get("localEndTime")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_setYeardaySchedule_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
+           Map<String, CommandParameter> doorLock_unlockDoor_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_unlockDoor_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
+                 CommandParameter doorLock_unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
+                 doorLock_unlockDoor_commandParams.put("pin",doorLock_unlockDoor_pin_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_unlockDoor_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .unlockDoor((ChipClusters.DoorLockCluster.UnlockDoorResponseCallback) callback
+                           ,  doorLock_unlockDoor_commandParams.get("pin") commandArguments.get("pin")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_unlockDoor_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
+           Map<String, CommandParameter> doorLock_unlockWithTimeout_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter doorLock_unlockWithTimeout_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
+                 CommandParameter doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter = new CommandParameter("timeoutInSeconds", int.class);
+                 doorLock_unlockWithTimeout_commandParams.put("timeoutInSeconds",doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter);
+                  
+                 CommandParameter doorLock_unlockWithTimeout_pin_commandParameter = new CommandParameter("pin", byte[].class);
+                 doorLock_unlockWithTimeout_commandParams.put("pin",doorLock_unlockWithTimeout_pin_commandParameter);
+                 
+           // Populate commands
+           CommandInfo doorLock_unlockWithTimeout_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.DoorLockCluster) cluster)
+                           .unlockWithTimeout((ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback) callback
+                           ,  doorLock_unlockWithTimeout_commandParams.get("timeoutInSeconds") commandArguments.get("timeoutInSeconds")
+                           ,  doorLock_unlockWithTimeout_commandParams.get("pin") commandArguments.get("pin")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   doorLock_unlockWithTimeout_commandParams
+           );
+           doorLock_ClusterCommandInfo.put("unlockWithTimeout", doorLock_unlockWithTimeout_CommandInfo);
+     // Populate cluster
+     ClusterInfo doorLock_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), doorLock_ClusterCommandInfo);
+     clusterMap.put("doorLock", doorLock_clusterInfo);
+     Map<String, CommandInfo> electricalMeasurement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId), electricalMeasurement_ClusterCommandInfo);
+     clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
+     Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter ethernetNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo ethernetNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                          .resetCounts((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   ethernetNetworkDiagnostics_resetCounts_commandParams
+           );
+           ethernetNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", ethernetNetworkDiagnostics_resetCounts_CommandInfo);
+     // Populate cluster
+     ClusterInfo ethernetNetworkDiagnostics_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId), ethernetNetworkDiagnostics_ClusterCommandInfo);
+     clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
+     Map<String, CommandInfo> fixedLabel_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo fixedLabel_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId), fixedLabel_ClusterCommandInfo);
+     clusterMap.put("fixedLabel", fixedLabel_clusterInfo);
+     Map<String, CommandInfo> flowMeasurement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId), flowMeasurement_ClusterCommandInfo);
+     clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
+     Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> generalCommissioning_armFailSafe_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter generalCommissioning_armFailSafe_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
+                 CommandParameter generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter = new CommandParameter("expiryLengthSeconds", int.class);
+                 generalCommissioning_armFailSafe_commandParams.put("expiryLengthSeconds",generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter);
+                  
+                 CommandParameter generalCommissioning_armFailSafe_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 generalCommissioning_armFailSafe_commandParams.put("breadcrumb",generalCommissioning_armFailSafe_breadcrumb_commandParameter);
+                  
+                 CommandParameter generalCommissioning_armFailSafe_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 generalCommissioning_armFailSafe_commandParams.put("timeoutMs",generalCommissioning_armFailSafe_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo generalCommissioning_armFailSafe_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GeneralCommissioningCluster) cluster)
+                           .armFailSafe((ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback) callback
+                           ,  generalCommissioning_armFailSafe_commandParams.get("expiryLengthSeconds") commandArguments.get("expiryLengthSeconds")
+                           ,  generalCommissioning_armFailSafe_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  generalCommissioning_armFailSafe_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   generalCommissioning_armFailSafe_commandParams
+           );
+           generalCommissioning_ClusterCommandInfo.put("armFailSafe", generalCommissioning_armFailSafe_CommandInfo);
+           Map<String, CommandParameter> generalCommissioning_commissioningComplete_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter generalCommissioning_commissioningComplete_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
+           // Populate commands
+           CommandInfo generalCommissioning_commissioningComplete_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GeneralCommissioningCluster) cluster)
+                           .commissioningComplete((ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   generalCommissioning_commissioningComplete_commandParams
+           );
+           generalCommissioning_ClusterCommandInfo.put("commissioningComplete", generalCommissioning_commissioningComplete_CommandInfo);
+           Map<String, CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter generalCommissioning_setRegulatoryConfig_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
+                 CommandParameter generalCommissioning_setRegulatoryConfig_location_commandParameter = new CommandParameter("location", int.class);
+                 generalCommissioning_setRegulatoryConfig_commandParams.put("location",generalCommissioning_setRegulatoryConfig_location_commandParameter);
+                  
+                 CommandParameter generalCommissioning_setRegulatoryConfig_countryCode_commandParameter = new CommandParameter("countryCode", String.class);
+                 generalCommissioning_setRegulatoryConfig_commandParams.put("countryCode",generalCommissioning_setRegulatoryConfig_countryCode_commandParameter);
+                  
+                 CommandParameter generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 generalCommissioning_setRegulatoryConfig_commandParams.put("breadcrumb",generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter);
+                  
+                 CommandParameter generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 generalCommissioning_setRegulatoryConfig_commandParams.put("timeoutMs",generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo generalCommissioning_setRegulatoryConfig_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GeneralCommissioningCluster) cluster)
+                           .setRegulatoryConfig((ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback) callback
+                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("location") commandArguments.get("location")
+                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("countryCode") commandArguments.get("countryCode")
+                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   generalCommissioning_setRegulatoryConfig_commandParams
+           );
+           generalCommissioning_ClusterCommandInfo.put("setRegulatoryConfig", generalCommissioning_setRegulatoryConfig_CommandInfo);
+     // Populate cluster
+     ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId), generalCommissioning_ClusterCommandInfo);
+     clusterMap.put("generalCommissioning", generalCommissioning_clusterInfo);
+     Map<String, CommandInfo> generalDiagnostics_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId), generalDiagnostics_ClusterCommandInfo);
+     clusterMap.put("generalDiagnostics", generalDiagnostics_clusterInfo);
+     Map<String, CommandInfo> groupKeyManagement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId), groupKeyManagement_ClusterCommandInfo);
+     clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
+     Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> groups_addGroup_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_addGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
+                 CommandParameter groups_addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 groups_addGroup_commandParams.put("groupId",groups_addGroup_groupId_commandParameter);
+                  
+                 CommandParameter groups_addGroup_groupName_commandParameter = new CommandParameter("groupName", String.class);
+                 groups_addGroup_commandParams.put("groupName",groups_addGroup_groupName_commandParameter);
+                 
+           // Populate commands
+           CommandInfo groups_addGroup_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                           .addGroup((ChipClusters.GroupsCluster.AddGroupResponseCallback) callback
+                           ,  groups_addGroup_commandParams.get("groupId") commandArguments.get("groupId")
+                           ,  groups_addGroup_commandParams.get("groupName") commandArguments.get("groupName")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_addGroup_commandParams
+           );
+           groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
+           Map<String, CommandParameter> groups_addGroupIfIdentifying_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_addGroupIfIdentifying_commandParameter = new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter groups_addGroupIfIdentifying_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 groups_addGroupIfIdentifying_commandParams.put("groupId",groups_addGroupIfIdentifying_groupId_commandParameter);
+                  
+                 CommandParameter groups_addGroupIfIdentifying_groupName_commandParameter = new CommandParameter("groupName", String.class);
+                 groups_addGroupIfIdentifying_commandParams.put("groupName",groups_addGroupIfIdentifying_groupName_commandParameter);
+                 
+           // Populate commands
+           CommandInfo groups_addGroupIfIdentifying_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                          .addGroupIfIdentifying((DefaultClusterCallback) callback
+                          ,  groups_addGroupIfIdentifying_commandParams.get("groupId") commandArguments.get("groupId")
+                          ,  groups_addGroupIfIdentifying_commandParams.get("groupName") commandArguments.get("groupName")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_addGroupIfIdentifying_commandParams
+           );
+           groups_ClusterCommandInfo.put("addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
+           Map<String, CommandParameter> groups_getGroupMembership_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_getGroupMembership_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
+                 CommandParameter groups_getGroupMembership_groupCount_commandParameter = new CommandParameter("groupCount", int.class);
+                 groups_getGroupMembership_commandParams.put("groupCount",groups_getGroupMembership_groupCount_commandParameter);
+                  
+                 CommandParameter groups_getGroupMembership_groupList_commandParameter = new CommandParameter("groupList", int.class);
+                 groups_getGroupMembership_commandParams.put("groupList",groups_getGroupMembership_groupList_commandParameter);
+                 
+           // Populate commands
+           CommandInfo groups_getGroupMembership_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                           .getGroupMembership((ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback
+                           ,  groups_getGroupMembership_commandParams.get("groupCount") commandArguments.get("groupCount")
+                           ,  groups_getGroupMembership_commandParams.get("groupList") commandArguments.get("groupList")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_getGroupMembership_commandParams
+           );
+           groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
+           Map<String, CommandParameter> groups_removeAllGroups_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_removeAllGroups_commandParameter = new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo groups_removeAllGroups_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                          .removeAllGroups((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_removeAllGroups_commandParams
+           );
+           groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
+           Map<String, CommandParameter> groups_removeGroup_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_removeGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
+                 CommandParameter groups_removeGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 groups_removeGroup_commandParams.put("groupId",groups_removeGroup_groupId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo groups_removeGroup_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                           .removeGroup((ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback
+                           ,  groups_removeGroup_commandParams.get("groupId") commandArguments.get("groupId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_removeGroup_commandParams
+           );
+           groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
+           Map<String, CommandParameter> groups_viewGroup_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter groups_viewGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
+                 CommandParameter groups_viewGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 groups_viewGroup_commandParams.put("groupId",groups_viewGroup_groupId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo groups_viewGroup_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.GroupsCluster) cluster)
+                           .viewGroup((ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback
+                           ,  groups_viewGroup_commandParams.get("groupId") commandArguments.get("groupId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   groups_viewGroup_commandParams
+           );
+           groups_ClusterCommandInfo.put("viewGroup", groups_viewGroup_CommandInfo);
+     // Populate cluster
+     ClusterInfo groups_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), groups_ClusterCommandInfo);
+     clusterMap.put("groups", groups_clusterInfo);
+     Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> identify_identify_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter identify_identify_commandParameter = new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter identify_identify_identifyTime_commandParameter = new CommandParameter("identifyTime", int.class);
+                 identify_identify_commandParams.put("identifyTime",identify_identify_identifyTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo identify_identify_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.IdentifyCluster) cluster)
+                          .identify((DefaultClusterCallback) callback
+                          ,  identify_identify_commandParams.get("identifyTime") commandArguments.get("identifyTime")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   identify_identify_commandParams
+           );
+           identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
+           Map<String, CommandParameter> identify_identifyQuery_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter identify_identifyQuery_commandParameter = new CommandParameter("Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
+           // Populate commands
+           CommandInfo identify_identifyQuery_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.IdentifyCluster) cluster)
+                           .identifyQuery((ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   identify_identifyQuery_commandParams
+           );
+           identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
+           Map<String, CommandParameter> identify_triggerEffect_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter identify_triggerEffect_commandParameter = new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter identify_triggerEffect_effectIdentifier_commandParameter = new CommandParameter("effectIdentifier", int.class);
+                 identify_triggerEffect_commandParams.put("effectIdentifier",identify_triggerEffect_effectIdentifier_commandParameter);
+                  
+                 CommandParameter identify_triggerEffect_effectVariant_commandParameter = new CommandParameter("effectVariant", int.class);
+                 identify_triggerEffect_commandParams.put("effectVariant",identify_triggerEffect_effectVariant_commandParameter);
+                 
+           // Populate commands
+           CommandInfo identify_triggerEffect_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.IdentifyCluster) cluster)
+                          .triggerEffect((DefaultClusterCallback) callback
+                          ,  identify_triggerEffect_commandParams.get("effectIdentifier") commandArguments.get("effectIdentifier")
+                          ,  identify_triggerEffect_commandParams.get("effectVariant") commandArguments.get("effectVariant")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   identify_triggerEffect_commandParams
+           );
+           identify_ClusterCommandInfo.put("triggerEffect", identify_triggerEffect_CommandInfo);
+     // Populate cluster
+     ClusterInfo identify_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId), identify_ClusterCommandInfo);
+     clusterMap.put("identify", identify_clusterInfo);
+     Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> keypadInput_sendKey_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter keypadInput_sendKey_commandParameter = new CommandParameter("KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
+                 CommandParameter keypadInput_sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
+                 keypadInput_sendKey_commandParams.put("keyCode",keypadInput_sendKey_keyCode_commandParameter);
+                 
+           // Populate commands
+           CommandInfo keypadInput_sendKey_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.KeypadInputCluster) cluster)
+                           .sendKey((ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback
+                           ,  keypadInput_sendKey_commandParams.get("keyCode") commandArguments.get("keyCode")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   keypadInput_sendKey_commandParams
+           );
+           keypadInput_ClusterCommandInfo.put("sendKey", keypadInput_sendKey_CommandInfo);
+     // Populate cluster
+     ClusterInfo keypadInput_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId), keypadInput_ClusterCommandInfo);
+     clusterMap.put("keypadInput", keypadInput_clusterInfo);
+     Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> levelControl_move_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_move_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_move_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 levelControl_move_commandParams.put("moveMode",levelControl_move_moveMode_commandParameter);
+                  
+                 CommandParameter levelControl_move_rate_commandParameter = new CommandParameter("rate", int.class);
+                 levelControl_move_commandParams.put("rate",levelControl_move_rate_commandParameter);
+                  
+                 CommandParameter levelControl_move_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+                 levelControl_move_commandParams.put("optionMask",levelControl_move_optionMask_commandParameter);
+                  
+                 CommandParameter levelControl_move_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
+                 levelControl_move_commandParams.put("optionOverride",levelControl_move_optionOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_move_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .move((DefaultClusterCallback) callback
+                          ,  levelControl_move_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  levelControl_move_commandParams.get("rate") commandArguments.get("rate")
+                          ,  levelControl_move_commandParams.get("optionMask") commandArguments.get("optionMask")
+                          ,  levelControl_move_commandParams.get("optionOverride") commandArguments.get("optionOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_move_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
+           Map<String, CommandParameter> levelControl_moveToLevel_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_moveToLevel_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_moveToLevel_level_commandParameter = new CommandParameter("level", int.class);
+                 levelControl_moveToLevel_commandParams.put("level",levelControl_moveToLevel_level_commandParameter);
+                  
+                 CommandParameter levelControl_moveToLevel_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 levelControl_moveToLevel_commandParams.put("transitionTime",levelControl_moveToLevel_transitionTime_commandParameter);
+                  
+                 CommandParameter levelControl_moveToLevel_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+                 levelControl_moveToLevel_commandParams.put("optionMask",levelControl_moveToLevel_optionMask_commandParameter);
+                  
+                 CommandParameter levelControl_moveToLevel_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
+                 levelControl_moveToLevel_commandParams.put("optionOverride",levelControl_moveToLevel_optionOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_moveToLevel_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .moveToLevel((DefaultClusterCallback) callback
+                          ,  levelControl_moveToLevel_commandParams.get("level") commandArguments.get("level")
+                          ,  levelControl_moveToLevel_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  levelControl_moveToLevel_commandParams.get("optionMask") commandArguments.get("optionMask")
+                          ,  levelControl_moveToLevel_commandParams.get("optionOverride") commandArguments.get("optionOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_moveToLevel_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
+           Map<String, CommandParameter> levelControl_moveToLevelWithOnOff_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_moveToLevelWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_moveToLevelWithOnOff_level_commandParameter = new CommandParameter("level", int.class);
+                 levelControl_moveToLevelWithOnOff_commandParams.put("level",levelControl_moveToLevelWithOnOff_level_commandParameter);
+                  
+                 CommandParameter levelControl_moveToLevelWithOnOff_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 levelControl_moveToLevelWithOnOff_commandParams.put("transitionTime",levelControl_moveToLevelWithOnOff_transitionTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_moveToLevelWithOnOff_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .moveToLevelWithOnOff((DefaultClusterCallback) callback
+                          ,  levelControl_moveToLevelWithOnOff_commandParams.get("level") commandArguments.get("level")
+                          ,  levelControl_moveToLevelWithOnOff_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_moveToLevelWithOnOff_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
+           Map<String, CommandParameter> levelControl_moveWithOnOff_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_moveWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_moveWithOnOff_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
+                 levelControl_moveWithOnOff_commandParams.put("moveMode",levelControl_moveWithOnOff_moveMode_commandParameter);
+                  
+                 CommandParameter levelControl_moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
+                 levelControl_moveWithOnOff_commandParams.put("rate",levelControl_moveWithOnOff_rate_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_moveWithOnOff_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .moveWithOnOff((DefaultClusterCallback) callback
+                          ,  levelControl_moveWithOnOff_commandParams.get("moveMode") commandArguments.get("moveMode")
+                          ,  levelControl_moveWithOnOff_commandParams.get("rate") commandArguments.get("rate")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_moveWithOnOff_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
+           Map<String, CommandParameter> levelControl_step_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_step_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_step_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 levelControl_step_commandParams.put("stepMode",levelControl_step_stepMode_commandParameter);
+                  
+                 CommandParameter levelControl_step_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 levelControl_step_commandParams.put("stepSize",levelControl_step_stepSize_commandParameter);
+                  
+                 CommandParameter levelControl_step_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 levelControl_step_commandParams.put("transitionTime",levelControl_step_transitionTime_commandParameter);
+                  
+                 CommandParameter levelControl_step_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+                 levelControl_step_commandParams.put("optionMask",levelControl_step_optionMask_commandParameter);
+                  
+                 CommandParameter levelControl_step_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
+                 levelControl_step_commandParams.put("optionOverride",levelControl_step_optionOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_step_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .step((DefaultClusterCallback) callback
+                          ,  levelControl_step_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  levelControl_step_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  levelControl_step_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                          ,  levelControl_step_commandParams.get("optionMask") commandArguments.get("optionMask")
+                          ,  levelControl_step_commandParams.get("optionOverride") commandArguments.get("optionOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_step_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
+           Map<String, CommandParameter> levelControl_stepWithOnOff_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_stepWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_stepWithOnOff_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
+                 levelControl_stepWithOnOff_commandParams.put("stepMode",levelControl_stepWithOnOff_stepMode_commandParameter);
+                  
+                 CommandParameter levelControl_stepWithOnOff_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
+                 levelControl_stepWithOnOff_commandParams.put("stepSize",levelControl_stepWithOnOff_stepSize_commandParameter);
+                  
+                 CommandParameter levelControl_stepWithOnOff_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 levelControl_stepWithOnOff_commandParams.put("transitionTime",levelControl_stepWithOnOff_transitionTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_stepWithOnOff_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .stepWithOnOff((DefaultClusterCallback) callback
+                          ,  levelControl_stepWithOnOff_commandParams.get("stepMode") commandArguments.get("stepMode")
+                          ,  levelControl_stepWithOnOff_commandParams.get("stepSize") commandArguments.get("stepSize")
+                          ,  levelControl_stepWithOnOff_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_stepWithOnOff_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
+           Map<String, CommandParameter> levelControl_stop_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_stop_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter levelControl_stop_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
+                 levelControl_stop_commandParams.put("optionMask",levelControl_stop_optionMask_commandParameter);
+                  
+                 CommandParameter levelControl_stop_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
+                 levelControl_stop_commandParams.put("optionOverride",levelControl_stop_optionOverride_commandParameter);
+                 
+           // Populate commands
+           CommandInfo levelControl_stop_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .stop((DefaultClusterCallback) callback
+                          ,  levelControl_stop_commandParams.get("optionMask") commandArguments.get("optionMask")
+                          ,  levelControl_stop_commandParams.get("optionOverride") commandArguments.get("optionOverride")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_stop_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
+           Map<String, CommandParameter> levelControl_stopWithOnOff_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter levelControl_stopWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo levelControl_stopWithOnOff_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LevelControlCluster) cluster)
+                          .stopWithOnOff((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   levelControl_stopWithOnOff_commandParams
+           );
+           levelControl_ClusterCommandInfo.put("stopWithOnOff", levelControl_stopWithOnOff_CommandInfo);
+     // Populate cluster
+     ClusterInfo levelControl_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId), levelControl_ClusterCommandInfo);
+     clusterMap.put("levelControl", levelControl_clusterInfo);
+     Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> lowPower_sleep_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter lowPower_sleep_commandParameter = new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo lowPower_sleep_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.LowPowerCluster) cluster)
+                          .sleep((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   lowPower_sleep_commandParams
+           );
+           lowPower_ClusterCommandInfo.put("sleep", lowPower_sleep_CommandInfo);
+     // Populate cluster
+     ClusterInfo lowPower_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId), lowPower_ClusterCommandInfo);
+     clusterMap.put("lowPower", lowPower_clusterInfo);
+     Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> mediaInput_hideInputStatus_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaInput_hideInputStatus_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo mediaInput_hideInputStatus_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaInputCluster) cluster)
+                          .hideInputStatus((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaInput_hideInputStatus_commandParams
+           );
+           mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
+           Map<String, CommandParameter> mediaInput_renameInput_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaInput_renameInput_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter mediaInput_renameInput_index_commandParameter = new CommandParameter("index", int.class);
+                 mediaInput_renameInput_commandParams.put("index",mediaInput_renameInput_index_commandParameter);
+                  
+                 CommandParameter mediaInput_renameInput_name_commandParameter = new CommandParameter("name", String.class);
+                 mediaInput_renameInput_commandParams.put("name",mediaInput_renameInput_name_commandParameter);
+                 
+           // Populate commands
+           CommandInfo mediaInput_renameInput_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaInputCluster) cluster)
+                          .renameInput((DefaultClusterCallback) callback
+                          ,  mediaInput_renameInput_commandParams.get("index") commandArguments.get("index")
+                          ,  mediaInput_renameInput_commandParams.get("name") commandArguments.get("name")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaInput_renameInput_commandParams
+           );
+           mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
+           Map<String, CommandParameter> mediaInput_selectInput_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaInput_selectInput_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter mediaInput_selectInput_index_commandParameter = new CommandParameter("index", int.class);
+                 mediaInput_selectInput_commandParams.put("index",mediaInput_selectInput_index_commandParameter);
+                 
+           // Populate commands
+           CommandInfo mediaInput_selectInput_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaInputCluster) cluster)
+                          .selectInput((DefaultClusterCallback) callback
+                          ,  mediaInput_selectInput_commandParams.get("index") commandArguments.get("index")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaInput_selectInput_commandParams
+           );
+           mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
+           Map<String, CommandParameter> mediaInput_showInputStatus_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaInput_showInputStatus_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo mediaInput_showInputStatus_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaInputCluster) cluster)
+                          .showInputStatus((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaInput_showInputStatus_commandParams
+           );
+           mediaInput_ClusterCommandInfo.put("showInputStatus", mediaInput_showInputStatus_CommandInfo);
+     // Populate cluster
+     ClusterInfo mediaInput_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId), mediaInput_ClusterCommandInfo);
+     clusterMap.put("mediaInput", mediaInput_clusterInfo);
+     Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> mediaPlayback_mediaFastForward_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaFastForward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaFastForward_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaFastForward((ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaFastForward_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaFastForward", mediaPlayback_mediaFastForward_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaNext_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaNext_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaNext_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaNext((ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaNext_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaPause_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaPause_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaPause_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaPause((ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaPause_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaPlay_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaPlay_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaPlay_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaPlay((ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaPlay_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaPrevious_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaPrevious_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaPrevious_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaPrevious((ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaPrevious_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaRewind_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaRewind_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaRewind_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaRewind((ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaRewind_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaSeek_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaSeek_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
+                 CommandParameter mediaPlayback_mediaSeek_position_commandParameter = new CommandParameter("position", long.class);
+                 mediaPlayback_mediaSeek_commandParams.put("position",mediaPlayback_mediaSeek_position_commandParameter);
+                 
+           // Populate commands
+           CommandInfo mediaPlayback_mediaSeek_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaSeek((ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback) callback
+                           ,  mediaPlayback_mediaSeek_commandParams.get("position") commandArguments.get("position")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaSeek_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaSkipBackward_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaSkipBackward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
+                 CommandParameter mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter = new CommandParameter("deltaPositionMilliseconds", long.class);
+                 mediaPlayback_mediaSkipBackward_commandParams.put("deltaPositionMilliseconds",mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
+                 
+           // Populate commands
+           CommandInfo mediaPlayback_mediaSkipBackward_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaSkipBackward((ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback) callback
+                           ,  mediaPlayback_mediaSkipBackward_commandParams.get("deltaPositionMilliseconds") commandArguments.get("deltaPositionMilliseconds")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaSkipBackward_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaSkipBackward", mediaPlayback_mediaSkipBackward_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaSkipForward_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaSkipForward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
+                 CommandParameter mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter = new CommandParameter("deltaPositionMilliseconds", long.class);
+                 mediaPlayback_mediaSkipForward_commandParams.put("deltaPositionMilliseconds",mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
+                 
+           // Populate commands
+           CommandInfo mediaPlayback_mediaSkipForward_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaSkipForward((ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback) callback
+                           ,  mediaPlayback_mediaSkipForward_commandParams.get("deltaPositionMilliseconds") commandArguments.get("deltaPositionMilliseconds")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaSkipForward_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaSkipForward", mediaPlayback_mediaSkipForward_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaStartOver_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaStartOver_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaStartOver_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaStartOver((ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaStartOver_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaStartOver", mediaPlayback_mediaStartOver_CommandInfo);
+           Map<String, CommandParameter> mediaPlayback_mediaStop_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter mediaPlayback_mediaStop_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
+           // Populate commands
+           CommandInfo mediaPlayback_mediaStop_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.MediaPlaybackCluster) cluster)
+                           .mediaStop((ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   mediaPlayback_mediaStop_commandParams
+           );
+           mediaPlayback_ClusterCommandInfo.put("mediaStop", mediaPlayback_mediaStop_CommandInfo);
+     // Populate cluster
+     ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId), mediaPlayback_ClusterCommandInfo);
+     clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
+     Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> networkCommissioning_addThreadNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_addThreadNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_addThreadNetwork_operationalDataset_commandParameter = new CommandParameter("operationalDataset", byte[].class);
+                 networkCommissioning_addThreadNetwork_commandParams.put("operationalDataset",networkCommissioning_addThreadNetwork_operationalDataset_commandParameter);
+                  
+                 CommandParameter networkCommissioning_addThreadNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_addThreadNetwork_commandParams.put("breadcrumb",networkCommissioning_addThreadNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_addThreadNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_addThreadNetwork_commandParams.put("timeoutMs",networkCommissioning_addThreadNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_addThreadNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .addThreadNetwork((ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback) callback
+                           ,  networkCommissioning_addThreadNetwork_commandParams.get("operationalDataset") commandArguments.get("operationalDataset")
+                           ,  networkCommissioning_addThreadNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_addThreadNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_addThreadNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("addThreadNetwork", networkCommissioning_addThreadNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_addWiFiNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_addWiFiNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_addWiFiNetwork_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+                 networkCommissioning_addWiFiNetwork_commandParams.put("ssid",networkCommissioning_addWiFiNetwork_ssid_commandParameter);
+                  
+                 CommandParameter networkCommissioning_addWiFiNetwork_credentials_commandParameter = new CommandParameter("credentials", byte[].class);
+                 networkCommissioning_addWiFiNetwork_commandParams.put("credentials",networkCommissioning_addWiFiNetwork_credentials_commandParameter);
+                  
+                 CommandParameter networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_addWiFiNetwork_commandParams.put("breadcrumb",networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_addWiFiNetwork_commandParams.put("timeoutMs",networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_addWiFiNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .addWiFiNetwork((ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback) callback
+                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("ssid") commandArguments.get("ssid")
+                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("credentials") commandArguments.get("credentials")
+                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_addWiFiNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("addWiFiNetwork", networkCommissioning_addWiFiNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_disableNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_disableNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_disableNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+                 networkCommissioning_disableNetwork_commandParams.put("networkID",networkCommissioning_disableNetwork_networkID_commandParameter);
+                  
+                 CommandParameter networkCommissioning_disableNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_disableNetwork_commandParams.put("breadcrumb",networkCommissioning_disableNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_disableNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_disableNetwork_commandParams.put("timeoutMs",networkCommissioning_disableNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_disableNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .disableNetwork((ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback) callback
+                           ,  networkCommissioning_disableNetwork_commandParams.get("networkID") commandArguments.get("networkID")
+                           ,  networkCommissioning_disableNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_disableNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_disableNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("disableNetwork", networkCommissioning_disableNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_enableNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_enableNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_enableNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+                 networkCommissioning_enableNetwork_commandParams.put("networkID",networkCommissioning_enableNetwork_networkID_commandParameter);
+                  
+                 CommandParameter networkCommissioning_enableNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_enableNetwork_commandParams.put("breadcrumb",networkCommissioning_enableNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_enableNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_enableNetwork_commandParams.put("timeoutMs",networkCommissioning_enableNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_enableNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .enableNetwork((ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback) callback
+                           ,  networkCommissioning_enableNetwork_commandParams.get("networkID") commandArguments.get("networkID")
+                           ,  networkCommissioning_enableNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_enableNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_enableNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("enableNetwork", networkCommissioning_enableNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_getLastNetworkCommissioningResult_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_getLastNetworkCommissioningResult_commandParams.put("timeoutMs",networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_getLastNetworkCommissioningResult_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                          .getLastNetworkCommissioningResult((DefaultClusterCallback) callback
+                          ,  networkCommissioning_getLastNetworkCommissioningResult_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_getLastNetworkCommissioningResult_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("getLastNetworkCommissioningResult", networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_removeNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_removeNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_removeNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
+                 networkCommissioning_removeNetwork_commandParams.put("networkID",networkCommissioning_removeNetwork_networkID_commandParameter);
+                  
+                 CommandParameter networkCommissioning_removeNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_removeNetwork_commandParams.put("breadcrumb",networkCommissioning_removeNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_removeNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_removeNetwork_commandParams.put("timeoutMs",networkCommissioning_removeNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_removeNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .removeNetwork((ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback) callback
+                           ,  networkCommissioning_removeNetwork_commandParams.get("networkID") commandArguments.get("networkID")
+                           ,  networkCommissioning_removeNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_removeNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_removeNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("removeNetwork", networkCommissioning_removeNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_scanNetworks_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_scanNetworks_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
+                 CommandParameter networkCommissioning_scanNetworks_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+                 networkCommissioning_scanNetworks_commandParams.put("ssid",networkCommissioning_scanNetworks_ssid_commandParameter);
+                  
+                 CommandParameter networkCommissioning_scanNetworks_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_scanNetworks_commandParams.put("breadcrumb",networkCommissioning_scanNetworks_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_scanNetworks_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_scanNetworks_commandParams.put("timeoutMs",networkCommissioning_scanNetworks_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_scanNetworks_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .scanNetworks((ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback) callback
+                           ,  networkCommissioning_scanNetworks_commandParams.get("ssid") commandArguments.get("ssid")
+                           ,  networkCommissioning_scanNetworks_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_scanNetworks_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_scanNetworks_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("scanNetworks", networkCommissioning_scanNetworks_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_updateThreadNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_updateThreadNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter = new CommandParameter("operationalDataset", byte[].class);
+                 networkCommissioning_updateThreadNetwork_commandParams.put("operationalDataset",networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter);
+                  
+                 CommandParameter networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_updateThreadNetwork_commandParams.put("breadcrumb",networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_updateThreadNetwork_commandParams.put("timeoutMs",networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_updateThreadNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .updateThreadNetwork((ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback) callback
+                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("operationalDataset") commandArguments.get("operationalDataset")
+                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_updateThreadNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("updateThreadNetwork", networkCommissioning_updateThreadNetwork_CommandInfo);
+           Map<String, CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter networkCommissioning_updateWiFiNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
+                 CommandParameter networkCommissioning_updateWiFiNetwork_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
+                 networkCommissioning_updateWiFiNetwork_commandParams.put("ssid",networkCommissioning_updateWiFiNetwork_ssid_commandParameter);
+                  
+                 CommandParameter networkCommissioning_updateWiFiNetwork_credentials_commandParameter = new CommandParameter("credentials", byte[].class);
+                 networkCommissioning_updateWiFiNetwork_commandParams.put("credentials",networkCommissioning_updateWiFiNetwork_credentials_commandParameter);
+                  
+                 CommandParameter networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
+                 networkCommissioning_updateWiFiNetwork_commandParams.put("breadcrumb",networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter);
+                  
+                 CommandParameter networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
+                 networkCommissioning_updateWiFiNetwork_commandParams.put("timeoutMs",networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter);
+                 
+           // Populate commands
+           CommandInfo networkCommissioning_updateWiFiNetwork_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.NetworkCommissioningCluster) cluster)
+                           .updateWiFiNetwork((ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback) callback
+                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("ssid") commandArguments.get("ssid")
+                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("credentials") commandArguments.get("credentials")
+                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
+                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   networkCommissioning_updateWiFiNetwork_commandParams
+           );
+           networkCommissioning_ClusterCommandInfo.put("updateWiFiNetwork", networkCommissioning_updateWiFiNetwork_CommandInfo);
+     // Populate cluster
+     ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId), networkCommissioning_ClusterCommandInfo);
+     clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
+     Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
+                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter = new CommandParameter("updateToken", byte[].class);
+                 otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put("updateToken",otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter = new CommandParameter("newVersion", long.class);
+                 otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put("newVersion",otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter);
+                 
+           // Populate commands
+           CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                           .applyUpdateRequest((ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback) callback
+                           ,  otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.get("updateToken") commandArguments.get("updateToken")
+                           ,  otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.get("newVersion") commandArguments.get("newVersion")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   otaSoftwareUpdateProvider_applyUpdateRequest_commandParams
+           );
+           otaSoftwareUpdateProvider_ClusterCommandInfo.put("applyUpdateRequest", otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo);
+           Map<String, CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter = new CommandParameter("updateToken", byte[].class);
+                 otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put("updateToken",otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter = new CommandParameter("softwareVersion", long.class);
+                 otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put("softwareVersion",otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
+                 
+           // Populate commands
+           CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                          .notifyUpdateApplied((DefaultClusterCallback) callback
+                          ,  otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.get("updateToken") commandArguments.get("updateToken")
+                          ,  otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.get("softwareVersion") commandArguments.get("softwareVersion")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams
+           );
+           otaSoftwareUpdateProvider_ClusterCommandInfo.put("notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
+           Map<String, CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter = new CommandParameter("vendorId", int.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("vendorId",otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_productId_commandParameter = new CommandParameter("productId", int.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("productId",otaSoftwareUpdateProvider_queryImage_productId_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter = new CommandParameter("hardwareVersion", int.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("hardwareVersion",otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter = new CommandParameter("softwareVersion", long.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("softwareVersion",otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter = new CommandParameter("protocolsSupported", int.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("protocolsSupported",otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_location_commandParameter = new CommandParameter("location", String.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("location",otaSoftwareUpdateProvider_queryImage_location_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter = new CommandParameter("requestorCanConsent", boolean.class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("requestorCanConsent",otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter = new CommandParameter("metadataForProvider", byte[].class);
+                 otaSoftwareUpdateProvider_queryImage_commandParams.put("metadataForProvider",otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
+                 
+           // Populate commands
+           CommandInfo otaSoftwareUpdateProvider_queryImage_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                           .queryImage((ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback) callback
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("vendorId") commandArguments.get("vendorId")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("productId") commandArguments.get("productId")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("hardwareVersion") commandArguments.get("hardwareVersion")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("softwareVersion") commandArguments.get("softwareVersion")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("protocolsSupported") commandArguments.get("protocolsSupported")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("location") commandArguments.get("location")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("requestorCanConsent") commandArguments.get("requestorCanConsent")
+                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("metadataForProvider") commandArguments.get("metadataForProvider")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   otaSoftwareUpdateProvider_queryImage_commandParams
+           );
+           otaSoftwareUpdateProvider_ClusterCommandInfo.put("queryImage", otaSoftwareUpdateProvider_queryImage_CommandInfo);
+     // Populate cluster
+     ClusterInfo otaSoftwareUpdateProvider_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId), otaSoftwareUpdateProvider_ClusterCommandInfo);
+     clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
+     Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_commandParameter = new CommandParameter("OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter = new CommandParameter("providerLocation", byte[].class);
+                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("providerLocation",otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter = new CommandParameter("vendorId", int.class);
+                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("vendorId",otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter = new CommandParameter("announcementReason", int.class);
+                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("announcementReason",otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter);
+                  
+                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter = new CommandParameter("metadataForNode", byte[].class);
+                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("metadataForNode",otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
+                 
+           // Populate commands
+           CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                          .announceOtaProvider((DefaultClusterCallback) callback
+                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("providerLocation") commandArguments.get("providerLocation")
+                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("vendorId") commandArguments.get("vendorId")
+                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("announcementReason") commandArguments.get("announcementReason")
+                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("metadataForNode") commandArguments.get("metadataForNode")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   otaSoftwareUpdateRequestor_announceOtaProvider_commandParams
+           );
+           otaSoftwareUpdateRequestor_ClusterCommandInfo.put("announceOtaProvider", otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo);
+     // Populate cluster
+     ClusterInfo otaSoftwareUpdateRequestor_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId), otaSoftwareUpdateRequestor_ClusterCommandInfo);
+     clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
+     Map<String, CommandInfo> occupancySensing_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo occupancySensing_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId), occupancySensing_ClusterCommandInfo);
+     clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
+     Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> onOff_off_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_off_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo onOff_off_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .off((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_off_commandParams
+           );
+           onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
+           Map<String, CommandParameter> onOff_offWithEffect_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_offWithEffect_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter onOff_offWithEffect_effectId_commandParameter = new CommandParameter("effectId", int.class);
+                 onOff_offWithEffect_commandParams.put("effectId",onOff_offWithEffect_effectId_commandParameter);
+                  
+                 CommandParameter onOff_offWithEffect_effectVariant_commandParameter = new CommandParameter("effectVariant", int.class);
+                 onOff_offWithEffect_commandParams.put("effectVariant",onOff_offWithEffect_effectVariant_commandParameter);
+                 
+           // Populate commands
+           CommandInfo onOff_offWithEffect_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .offWithEffect((DefaultClusterCallback) callback
+                          ,  onOff_offWithEffect_commandParams.get("effectId") commandArguments.get("effectId")
+                          ,  onOff_offWithEffect_commandParams.get("effectVariant") commandArguments.get("effectVariant")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_offWithEffect_commandParams
+           );
+           onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
+           Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_on_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo onOff_on_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .on((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_on_commandParams
+           );
+           onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
+           Map<String, CommandParameter> onOff_onWithRecallGlobalScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_onWithRecallGlobalScene_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo onOff_onWithRecallGlobalScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .onWithRecallGlobalScene((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_onWithRecallGlobalScene_commandParams
+           );
+           onOff_ClusterCommandInfo.put("onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
+           Map<String, CommandParameter> onOff_onWithTimedOff_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_onWithTimedOff_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter onOff_onWithTimedOff_onOffControl_commandParameter = new CommandParameter("onOffControl", int.class);
+                 onOff_onWithTimedOff_commandParams.put("onOffControl",onOff_onWithTimedOff_onOffControl_commandParameter);
+                  
+                 CommandParameter onOff_onWithTimedOff_onTime_commandParameter = new CommandParameter("onTime", int.class);
+                 onOff_onWithTimedOff_commandParams.put("onTime",onOff_onWithTimedOff_onTime_commandParameter);
+                  
+                 CommandParameter onOff_onWithTimedOff_offWaitTime_commandParameter = new CommandParameter("offWaitTime", int.class);
+                 onOff_onWithTimedOff_commandParams.put("offWaitTime",onOff_onWithTimedOff_offWaitTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo onOff_onWithTimedOff_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .onWithTimedOff((DefaultClusterCallback) callback
+                          ,  onOff_onWithTimedOff_commandParams.get("onOffControl") commandArguments.get("onOffControl")
+                          ,  onOff_onWithTimedOff_commandParams.get("onTime") commandArguments.get("onTime")
+                          ,  onOff_onWithTimedOff_commandParams.get("offWaitTime") commandArguments.get("offWaitTime")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_onWithTimedOff_commandParams
+           );
+           onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
+           Map<String, CommandParameter> onOff_toggle_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter onOff_toggle_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo onOff_toggle_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OnOffCluster) cluster)
+                          .toggle((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   onOff_toggle_commandParams
+           );
+           onOff_ClusterCommandInfo.put("toggle", onOff_toggle_CommandInfo);
+     // Populate cluster
+     ClusterInfo onOff_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), onOff_ClusterCommandInfo);
+     clusterMap.put("onOff", onOff_clusterInfo);
+     Map<String, CommandInfo> onOffSwitchConfiguration_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId), onOffSwitchConfiguration_ClusterCommandInfo);
+     clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
+     Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> operationalCredentials_addNOC_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_addNOC_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+                 CommandParameter operationalCredentials_addNOC_NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
+                 operationalCredentials_addNOC_commandParams.put("NOCValue",operationalCredentials_addNOC_NOCValue_commandParameter);
+                  
+                 CommandParameter operationalCredentials_addNOC_ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
+                 operationalCredentials_addNOC_commandParams.put("ICACValue",operationalCredentials_addNOC_ICACValue_commandParameter);
+                  
+                 CommandParameter operationalCredentials_addNOC_IPKValue_commandParameter = new CommandParameter("IPKValue", byte[].class);
+                 operationalCredentials_addNOC_commandParams.put("IPKValue",operationalCredentials_addNOC_IPKValue_commandParameter);
+                  
+                 CommandParameter operationalCredentials_addNOC_caseAdminNode_commandParameter = new CommandParameter("caseAdminNode", long.class);
+                 operationalCredentials_addNOC_commandParams.put("caseAdminNode",operationalCredentials_addNOC_caseAdminNode_commandParameter);
+                  
+                 CommandParameter operationalCredentials_addNOC_adminVendorId_commandParameter = new CommandParameter("adminVendorId", int.class);
+                 operationalCredentials_addNOC_commandParams.put("adminVendorId",operationalCredentials_addNOC_adminVendorId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_addNOC_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .addNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+                           ,  operationalCredentials_addNOC_commandParams.get("NOCValue") commandArguments.get("NOCValue")
+                           ,  operationalCredentials_addNOC_commandParams.get("ICACValue") commandArguments.get("ICACValue")
+                           ,  operationalCredentials_addNOC_commandParams.get("IPKValue") commandArguments.get("IPKValue")
+                           ,  operationalCredentials_addNOC_commandParams.get("caseAdminNode") commandArguments.get("caseAdminNode")
+                           ,  operationalCredentials_addNOC_commandParams.get("adminVendorId") commandArguments.get("adminVendorId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_addNOC_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("addNOC", operationalCredentials_addNOC_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_addTrustedRootCertificate_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter = new CommandParameter("rootCertificate", byte[].class);
+                 operationalCredentials_addTrustedRootCertificate_commandParams.put("rootCertificate",operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_addTrustedRootCertificate_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                          .addTrustedRootCertificate((DefaultClusterCallback) callback
+                          ,  operationalCredentials_addTrustedRootCertificate_commandParams.get("rootCertificate") commandArguments.get("rootCertificate")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_addTrustedRootCertificate_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_attestationRequest_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_attestationRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
+                 CommandParameter operationalCredentials_attestationRequest_attestationNonce_commandParameter = new CommandParameter("attestationNonce", byte[].class);
+                 operationalCredentials_attestationRequest_commandParams.put("attestationNonce",operationalCredentials_attestationRequest_attestationNonce_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_attestationRequest_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .attestationRequest((ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback) callback
+                           ,  operationalCredentials_attestationRequest_commandParams.get("attestationNonce") commandArguments.get("attestationNonce")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_attestationRequest_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("attestationRequest", operationalCredentials_attestationRequest_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_certificateChainRequest_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_certificateChainRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
+                 CommandParameter operationalCredentials_certificateChainRequest_certificateType_commandParameter = new CommandParameter("certificateType", int.class);
+                 operationalCredentials_certificateChainRequest_commandParams.put("certificateType",operationalCredentials_certificateChainRequest_certificateType_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_certificateChainRequest_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .certificateChainRequest((ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback) callback
+                           ,  operationalCredentials_certificateChainRequest_commandParams.get("certificateType") commandArguments.get("certificateType")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_certificateChainRequest_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("certificateChainRequest", operationalCredentials_certificateChainRequest_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_opCSRRequest_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_opCSRRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
+                 CommandParameter operationalCredentials_opCSRRequest_CSRNonce_commandParameter = new CommandParameter("CSRNonce", byte[].class);
+                 operationalCredentials_opCSRRequest_commandParams.put("CSRNonce",operationalCredentials_opCSRRequest_CSRNonce_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_opCSRRequest_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .opCSRRequest((ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback) callback
+                           ,  operationalCredentials_opCSRRequest_commandParams.get("CSRNonce") commandArguments.get("CSRNonce")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_opCSRRequest_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("opCSRRequest", operationalCredentials_opCSRRequest_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_removeFabric_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_removeFabric_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+                 CommandParameter operationalCredentials_removeFabric_fabricIndex_commandParameter = new CommandParameter("fabricIndex", int.class);
+                 operationalCredentials_removeFabric_commandParams.put("fabricIndex",operationalCredentials_removeFabric_fabricIndex_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_removeFabric_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .removeFabric((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+                           ,  operationalCredentials_removeFabric_commandParams.get("fabricIndex") commandArguments.get("fabricIndex")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_removeFabric_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("removeFabric", operationalCredentials_removeFabric_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_removeTrustedRootCertificate_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_removeTrustedRootCertificate_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter = new CommandParameter("trustedRootIdentifier", byte[].class);
+                 operationalCredentials_removeTrustedRootCertificate_commandParams.put("trustedRootIdentifier",operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_removeTrustedRootCertificate_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                          .removeTrustedRootCertificate((DefaultClusterCallback) callback
+                          ,  operationalCredentials_removeTrustedRootCertificate_commandParams.get("trustedRootIdentifier") commandArguments.get("trustedRootIdentifier")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_removeTrustedRootCertificate_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("removeTrustedRootCertificate", operationalCredentials_removeTrustedRootCertificate_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_updateFabricLabel_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_updateFabricLabel_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+                 CommandParameter operationalCredentials_updateFabricLabel_label_commandParameter = new CommandParameter("label", String.class);
+                 operationalCredentials_updateFabricLabel_commandParams.put("label",operationalCredentials_updateFabricLabel_label_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_updateFabricLabel_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .updateFabricLabel((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+                           ,  operationalCredentials_updateFabricLabel_commandParams.get("label") commandArguments.get("label")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_updateFabricLabel_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("updateFabricLabel", operationalCredentials_updateFabricLabel_CommandInfo);
+           Map<String, CommandParameter> operationalCredentials_updateNOC_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter operationalCredentials_updateNOC_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+                 CommandParameter operationalCredentials_updateNOC_NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
+                 operationalCredentials_updateNOC_commandParams.put("NOCValue",operationalCredentials_updateNOC_NOCValue_commandParameter);
+                  
+                 CommandParameter operationalCredentials_updateNOC_ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
+                 operationalCredentials_updateNOC_commandParams.put("ICACValue",operationalCredentials_updateNOC_ICACValue_commandParameter);
+                 
+           // Populate commands
+           CommandInfo operationalCredentials_updateNOC_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.OperationalCredentialsCluster) cluster)
+                           .updateNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
+                           ,  operationalCredentials_updateNOC_commandParams.get("NOCValue") commandArguments.get("NOCValue")
+                           ,  operationalCredentials_updateNOC_commandParams.get("ICACValue") commandArguments.get("ICACValue")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   operationalCredentials_updateNOC_commandParams
+           );
+           operationalCredentials_ClusterCommandInfo.put("updateNOC", operationalCredentials_updateNOC_CommandInfo);
+     // Populate cluster
+     ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId), operationalCredentials_ClusterCommandInfo);
+     clusterMap.put("operationalCredentials", operationalCredentials_clusterInfo);
+     Map<String, CommandInfo> powerSource_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo powerSource_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId), powerSource_ClusterCommandInfo);
+     clusterMap.put("powerSource", powerSource_clusterInfo);
+     Map<String, CommandInfo> pressureMeasurement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId), pressureMeasurement_ClusterCommandInfo);
+     clusterMap.put("pressureMeasurement", pressureMeasurement_clusterInfo);
+     Map<String, CommandInfo> pumpConfigurationAndControl_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo pumpConfigurationAndControl_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId), pumpConfigurationAndControl_ClusterCommandInfo);
+     clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
+     Map<String, CommandInfo> relativeHumidityMeasurement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo relativeHumidityMeasurement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId), relativeHumidityMeasurement_ClusterCommandInfo);
+     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
+     Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> scenes_addScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_addScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
+                 CommandParameter scenes_addScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_addScene_commandParams.put("groupId",scenes_addScene_groupId_commandParameter);
+                  
+                 CommandParameter scenes_addScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+                 scenes_addScene_commandParams.put("sceneId",scenes_addScene_sceneId_commandParameter);
+                  
+                 CommandParameter scenes_addScene_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 scenes_addScene_commandParams.put("transitionTime",scenes_addScene_transitionTime_commandParameter);
+                  
+                 CommandParameter scenes_addScene_sceneName_commandParameter = new CommandParameter("sceneName", String.class);
+                 scenes_addScene_commandParams.put("sceneName",scenes_addScene_sceneName_commandParameter);
+                  
+                 CommandParameter scenes_addScene_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
+                 scenes_addScene_commandParams.put("clusterId",scenes_addScene_clusterId_commandParameter);
+                  
+                 CommandParameter scenes_addScene_length_commandParameter = new CommandParameter("length", int.class);
+                 scenes_addScene_commandParams.put("length",scenes_addScene_length_commandParameter);
+                  
+                 CommandParameter scenes_addScene_value_commandParameter = new CommandParameter("value", int.class);
+                 scenes_addScene_commandParams.put("value",scenes_addScene_value_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_addScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .addScene((ChipClusters.ScenesCluster.AddSceneResponseCallback) callback
+                           ,  scenes_addScene_commandParams.get("groupId") commandArguments.get("groupId")
+                           ,  scenes_addScene_commandParams.get("sceneId") commandArguments.get("sceneId")
+                           ,  scenes_addScene_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                           ,  scenes_addScene_commandParams.get("sceneName") commandArguments.get("sceneName")
+                           ,  scenes_addScene_commandParams.get("clusterId") commandArguments.get("clusterId")
+                           ,  scenes_addScene_commandParams.get("length") commandArguments.get("length")
+                           ,  scenes_addScene_commandParams.get("value") commandArguments.get("value")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_addScene_commandParams
+           );
+           scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
+           Map<String, CommandParameter> scenes_getSceneMembership_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_getSceneMembership_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
+                 CommandParameter scenes_getSceneMembership_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_getSceneMembership_commandParams.put("groupId",scenes_getSceneMembership_groupId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_getSceneMembership_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .getSceneMembership((ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback
+                           ,  scenes_getSceneMembership_commandParams.get("groupId") commandArguments.get("groupId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_getSceneMembership_commandParams
+           );
+           scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
+           Map<String, CommandParameter> scenes_recallScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_recallScene_commandParameter = new CommandParameter("Scenes", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter scenes_recallScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_recallScene_commandParams.put("groupId",scenes_recallScene_groupId_commandParameter);
+                  
+                 CommandParameter scenes_recallScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+                 scenes_recallScene_commandParams.put("sceneId",scenes_recallScene_sceneId_commandParameter);
+                  
+                 CommandParameter scenes_recallScene_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
+                 scenes_recallScene_commandParams.put("transitionTime",scenes_recallScene_transitionTime_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_recallScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                          .recallScene((DefaultClusterCallback) callback
+                          ,  scenes_recallScene_commandParams.get("groupId") commandArguments.get("groupId")
+                          ,  scenes_recallScene_commandParams.get("sceneId") commandArguments.get("sceneId")
+                          ,  scenes_recallScene_commandParams.get("transitionTime") commandArguments.get("transitionTime")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_recallScene_commandParams
+           );
+           scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
+           Map<String, CommandParameter> scenes_removeAllScenes_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_removeAllScenes_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
+                 CommandParameter scenes_removeAllScenes_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_removeAllScenes_commandParams.put("groupId",scenes_removeAllScenes_groupId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_removeAllScenes_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .removeAllScenes((ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback
+                           ,  scenes_removeAllScenes_commandParams.get("groupId") commandArguments.get("groupId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_removeAllScenes_commandParams
+           );
+           scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
+           Map<String, CommandParameter> scenes_removeScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_removeScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
+                 CommandParameter scenes_removeScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_removeScene_commandParams.put("groupId",scenes_removeScene_groupId_commandParameter);
+                  
+                 CommandParameter scenes_removeScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+                 scenes_removeScene_commandParams.put("sceneId",scenes_removeScene_sceneId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_removeScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .removeScene((ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback
+                           ,  scenes_removeScene_commandParams.get("groupId") commandArguments.get("groupId")
+                           ,  scenes_removeScene_commandParams.get("sceneId") commandArguments.get("sceneId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_removeScene_commandParams
+           );
+           scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
+           Map<String, CommandParameter> scenes_storeScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_storeScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
+                 CommandParameter scenes_storeScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_storeScene_commandParams.put("groupId",scenes_storeScene_groupId_commandParameter);
+                  
+                 CommandParameter scenes_storeScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+                 scenes_storeScene_commandParams.put("sceneId",scenes_storeScene_sceneId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_storeScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .storeScene((ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback
+                           ,  scenes_storeScene_commandParams.get("groupId") commandArguments.get("groupId")
+                           ,  scenes_storeScene_commandParams.get("sceneId") commandArguments.get("sceneId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_storeScene_commandParams
+           );
+           scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
+           Map<String, CommandParameter> scenes_viewScene_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter scenes_viewScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
+                 CommandParameter scenes_viewScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
+                 scenes_viewScene_commandParams.put("groupId",scenes_viewScene_groupId_commandParameter);
+                  
+                 CommandParameter scenes_viewScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
+                 scenes_viewScene_commandParams.put("sceneId",scenes_viewScene_sceneId_commandParameter);
+                 
+           // Populate commands
+           CommandInfo scenes_viewScene_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ScenesCluster) cluster)
+                           .viewScene((ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback
+                           ,  scenes_viewScene_commandParams.get("groupId") commandArguments.get("groupId")
+                           ,  scenes_viewScene_commandParams.get("sceneId") commandArguments.get("sceneId")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   scenes_viewScene_commandParams
+           );
+           scenes_ClusterCommandInfo.put("viewScene", scenes_viewScene_CommandInfo);
+     // Populate cluster
+     ClusterInfo scenes_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), scenes_ClusterCommandInfo);
+     clusterMap.put("scenes", scenes_clusterInfo);
+     Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> softwareDiagnostics_resetWatermarks_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter softwareDiagnostics_resetWatermarks_commandParameter = new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo softwareDiagnostics_resetWatermarks_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                          .resetWatermarks((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   softwareDiagnostics_resetWatermarks_commandParams
+           );
+           softwareDiagnostics_ClusterCommandInfo.put("resetWatermarks", softwareDiagnostics_resetWatermarks_CommandInfo);
+     // Populate cluster
+     ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId), softwareDiagnostics_ClusterCommandInfo);
+     clusterMap.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
+     Map<String, CommandInfo> switch_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo switch_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), switch_ClusterCommandInfo);
+     clusterMap.put("switch", switch_clusterInfo);
+     Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> tvChannel_changeChannel_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter tvChannel_changeChannel_commandParameter = new CommandParameter("TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
+                 CommandParameter tvChannel_changeChannel_match_commandParameter = new CommandParameter("match", String.class);
+                 tvChannel_changeChannel_commandParams.put("match",tvChannel_changeChannel_match_commandParameter);
+                 
+           // Populate commands
+           CommandInfo tvChannel_changeChannel_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TvChannelCluster) cluster)
+                           .changeChannel((ChipClusters.TvChannelCluster.ChangeChannelResponseCallback) callback
+                           ,  tvChannel_changeChannel_commandParams.get("match") commandArguments.get("match")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   tvChannel_changeChannel_commandParams
+           );
+           tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
+           Map<String, CommandParameter> tvChannel_changeChannelByNumber_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter tvChannel_changeChannelByNumber_commandParameter = new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter tvChannel_changeChannelByNumber_majorNumber_commandParameter = new CommandParameter("majorNumber", int.class);
+                 tvChannel_changeChannelByNumber_commandParams.put("majorNumber",tvChannel_changeChannelByNumber_majorNumber_commandParameter);
+                  
+                 CommandParameter tvChannel_changeChannelByNumber_minorNumber_commandParameter = new CommandParameter("minorNumber", int.class);
+                 tvChannel_changeChannelByNumber_commandParams.put("minorNumber",tvChannel_changeChannelByNumber_minorNumber_commandParameter);
+                 
+           // Populate commands
+           CommandInfo tvChannel_changeChannelByNumber_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TvChannelCluster) cluster)
+                          .changeChannelByNumber((DefaultClusterCallback) callback
+                          ,  tvChannel_changeChannelByNumber_commandParams.get("majorNumber") commandArguments.get("majorNumber")
+                          ,  tvChannel_changeChannelByNumber_commandParams.get("minorNumber") commandArguments.get("minorNumber")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   tvChannel_changeChannelByNumber_commandParams
+           );
+           tvChannel_ClusterCommandInfo.put("changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
+           Map<String, CommandParameter> tvChannel_skipChannel_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter tvChannel_skipChannel_commandParameter = new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter tvChannel_skipChannel_count_commandParameter = new CommandParameter("count", int.class);
+                 tvChannel_skipChannel_commandParams.put("count",tvChannel_skipChannel_count_commandParameter);
+                 
+           // Populate commands
+           CommandInfo tvChannel_skipChannel_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TvChannelCluster) cluster)
+                          .skipChannel((DefaultClusterCallback) callback
+                          ,  tvChannel_skipChannel_commandParams.get("count") commandArguments.get("count")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   tvChannel_skipChannel_commandParams
+           );
+           tvChannel_ClusterCommandInfo.put("skipChannel", tvChannel_skipChannel_CommandInfo);
+     // Populate cluster
+     ClusterInfo tvChannel_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId), tvChannel_ClusterCommandInfo);
+     clusterMap.put("tvChannel", tvChannel_clusterInfo);
+     Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> targetNavigator_navigateTarget_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter targetNavigator_navigateTarget_commandParameter = new CommandParameter("TargetNavigator", ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
+                 CommandParameter targetNavigator_navigateTarget_target_commandParameter = new CommandParameter("target", int.class);
+                 targetNavigator_navigateTarget_commandParams.put("target",targetNavigator_navigateTarget_target_commandParameter);
+                  
+                 CommandParameter targetNavigator_navigateTarget_data_commandParameter = new CommandParameter("data", String.class);
+                 targetNavigator_navigateTarget_commandParams.put("data",targetNavigator_navigateTarget_data_commandParameter);
+                 
+           // Populate commands
+           CommandInfo targetNavigator_navigateTarget_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TargetNavigatorCluster) cluster)
+                           .navigateTarget((ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback
+                           ,  targetNavigator_navigateTarget_commandParams.get("target") commandArguments.get("target")
+                           ,  targetNavigator_navigateTarget_commandParams.get("data") commandArguments.get("data")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   targetNavigator_navigateTarget_commandParams
+           );
+           targetNavigator_ClusterCommandInfo.put("navigateTarget", targetNavigator_navigateTarget_CommandInfo);
+     // Populate cluster
+     ClusterInfo targetNavigator_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId), targetNavigator_ClusterCommandInfo);
+     clusterMap.put("targetNavigator", targetNavigator_clusterInfo);
+     Map<String, CommandInfo> temperatureMeasurement_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId), temperatureMeasurement_ClusterCommandInfo);
+     clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
+     Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> testCluster_test_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter testCluster_test_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo testCluster_test_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TestClusterCluster) cluster)
+                          .test((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   testCluster_test_commandParams
+           );
+           testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
+           Map<String, CommandParameter> testCluster_testAddArguments_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter testCluster_testAddArguments_commandParameter = new CommandParameter("TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
+                 CommandParameter testCluster_testAddArguments_arg1_commandParameter = new CommandParameter("arg1", int.class);
+                 testCluster_testAddArguments_commandParams.put("arg1",testCluster_testAddArguments_arg1_commandParameter);
+                  
+                 CommandParameter testCluster_testAddArguments_arg2_commandParameter = new CommandParameter("arg2", int.class);
+                 testCluster_testAddArguments_commandParams.put("arg2",testCluster_testAddArguments_arg2_commandParameter);
+                 
+           // Populate commands
+           CommandInfo testCluster_testAddArguments_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TestClusterCluster) cluster)
+                           .testAddArguments((ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback
+                           ,  testCluster_testAddArguments_commandParams.get("arg1") commandArguments.get("arg1")
+                           ,  testCluster_testAddArguments_commandParams.get("arg2") commandArguments.get("arg2")
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   testCluster_testAddArguments_commandParams
+           );
+           testCluster_ClusterCommandInfo.put("testAddArguments", testCluster_testAddArguments_CommandInfo);
+           Map<String, CommandParameter> testCluster_testNotHandled_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter testCluster_testNotHandled_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo testCluster_testNotHandled_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TestClusterCluster) cluster)
+                          .testNotHandled((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   testCluster_testNotHandled_commandParams
+           );
+           testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
+           Map<String, CommandParameter> testCluster_testSpecific_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter testCluster_testSpecific_commandParameter = new CommandParameter("TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
+           // Populate commands
+           CommandInfo testCluster_testSpecific_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TestClusterCluster) cluster)
+                           .testSpecific((ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback
+                       );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   testCluster_testSpecific_commandParams
+           );
+           testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
+           Map<String, CommandParameter> testCluster_testUnknownCommand_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter testCluster_testUnknownCommand_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo testCluster_testUnknownCommand_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.TestClusterCluster) cluster)
+                          .testUnknownCommand((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   testCluster_testUnknownCommand_commandParams
+           );
+           testCluster_ClusterCommandInfo.put("testUnknownCommand", testCluster_testUnknownCommand_CommandInfo);
+     // Populate cluster
+     ClusterInfo testCluster_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId), testCluster_ClusterCommandInfo);
+     clusterMap.put("testCluster", testCluster_clusterInfo);
+     Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> thermostat_clearWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter thermostat_clearWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo thermostat_clearWeeklySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThermostatCluster) cluster)
+                          .clearWeeklySchedule((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   thermostat_clearWeeklySchedule_commandParams
+           );
+           thermostat_ClusterCommandInfo.put("clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
+           Map<String, CommandParameter> thermostat_getRelayStatusLog_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter thermostat_getRelayStatusLog_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo thermostat_getRelayStatusLog_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThermostatCluster) cluster)
+                          .getRelayStatusLog((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   thermostat_getRelayStatusLog_commandParams
+           );
+           thermostat_ClusterCommandInfo.put("getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
+           Map<String, CommandParameter> thermostat_getWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter thermostat_getWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter thermostat_getWeeklySchedule_daysToReturn_commandParameter = new CommandParameter("daysToReturn", int.class);
+                 thermostat_getWeeklySchedule_commandParams.put("daysToReturn",thermostat_getWeeklySchedule_daysToReturn_commandParameter);
+                  
+                 CommandParameter thermostat_getWeeklySchedule_modeToReturn_commandParameter = new CommandParameter("modeToReturn", int.class);
+                 thermostat_getWeeklySchedule_commandParams.put("modeToReturn",thermostat_getWeeklySchedule_modeToReturn_commandParameter);
+                 
+           // Populate commands
+           CommandInfo thermostat_getWeeklySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThermostatCluster) cluster)
+                          .getWeeklySchedule((DefaultClusterCallback) callback
+                          ,  thermostat_getWeeklySchedule_commandParams.get("daysToReturn") commandArguments.get("daysToReturn")
+                          ,  thermostat_getWeeklySchedule_commandParams.get("modeToReturn") commandArguments.get("modeToReturn")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   thermostat_getWeeklySchedule_commandParams
+           );
+           thermostat_ClusterCommandInfo.put("getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
+           Map<String, CommandParameter> thermostat_setWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter thermostat_setWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter = new CommandParameter("numberOfTransitionsForSequence", int.class);
+                 thermostat_setWeeklySchedule_commandParams.put("numberOfTransitionsForSequence",thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
+                  
+                 CommandParameter thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter = new CommandParameter("dayOfWeekForSequence", int.class);
+                 thermostat_setWeeklySchedule_commandParams.put("dayOfWeekForSequence",thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter);
+                  
+                 CommandParameter thermostat_setWeeklySchedule_modeForSequence_commandParameter = new CommandParameter("modeForSequence", int.class);
+                 thermostat_setWeeklySchedule_commandParams.put("modeForSequence",thermostat_setWeeklySchedule_modeForSequence_commandParameter);
+                  
+                 CommandParameter thermostat_setWeeklySchedule_payload_commandParameter = new CommandParameter("payload", int.class);
+                 thermostat_setWeeklySchedule_commandParams.put("payload",thermostat_setWeeklySchedule_payload_commandParameter);
+                 
+           // Populate commands
+           CommandInfo thermostat_setWeeklySchedule_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThermostatCluster) cluster)
+                          .setWeeklySchedule((DefaultClusterCallback) callback
+                          ,  thermostat_setWeeklySchedule_commandParams.get("numberOfTransitionsForSequence") commandArguments.get("numberOfTransitionsForSequence")
+                          ,  thermostat_setWeeklySchedule_commandParams.get("dayOfWeekForSequence") commandArguments.get("dayOfWeekForSequence")
+                          ,  thermostat_setWeeklySchedule_commandParams.get("modeForSequence") commandArguments.get("modeForSequence")
+                          ,  thermostat_setWeeklySchedule_commandParams.get("payload") commandArguments.get("payload")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   thermostat_setWeeklySchedule_commandParams
+           );
+           thermostat_ClusterCommandInfo.put("setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
+           Map<String, CommandParameter> thermostat_setpointRaiseLower_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter thermostat_setpointRaiseLower_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter thermostat_setpointRaiseLower_mode_commandParameter = new CommandParameter("mode", int.class);
+                 thermostat_setpointRaiseLower_commandParams.put("mode",thermostat_setpointRaiseLower_mode_commandParameter);
+                  
+                 CommandParameter thermostat_setpointRaiseLower_amount_commandParameter = new CommandParameter("amount", int.class);
+                 thermostat_setpointRaiseLower_commandParams.put("amount",thermostat_setpointRaiseLower_amount_commandParameter);
+                 
+           // Populate commands
+           CommandInfo thermostat_setpointRaiseLower_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThermostatCluster) cluster)
+                          .setpointRaiseLower((DefaultClusterCallback) callback
+                          ,  thermostat_setpointRaiseLower_commandParams.get("mode") commandArguments.get("mode")
+                          ,  thermostat_setpointRaiseLower_commandParams.get("amount") commandArguments.get("amount")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   thermostat_setpointRaiseLower_commandParams
+           );
+           thermostat_ClusterCommandInfo.put("setpointRaiseLower", thermostat_setpointRaiseLower_CommandInfo);
+     // Populate cluster
+     ClusterInfo thermostat_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId), thermostat_ClusterCommandInfo);
+     clusterMap.put("thermostat", thermostat_clusterInfo);
+     Map<String, CommandInfo> thermostatUserInterfaceConfiguration_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId), thermostatUserInterfaceConfiguration_ClusterCommandInfo);
+     clusterMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
+     Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter threadNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo threadNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                          .resetCounts((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   threadNetworkDiagnostics_resetCounts_commandParams
+           );
+           threadNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", threadNetworkDiagnostics_resetCounts_CommandInfo);
+     // Populate cluster
+     ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId), threadNetworkDiagnostics_ClusterCommandInfo);
+     clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
+     Map<String, CommandInfo> wakeOnLan_ClusterCommandInfo = new HashMap<>();
+     // Populate cluster
+     ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId), wakeOnLan_ClusterCommandInfo);
+     clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
+     Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter wiFiNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo wiFiNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                          .resetCounts((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   wiFiNetworkDiagnostics_resetCounts_commandParams
+           );
+           wiFiNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", wiFiNetworkDiagnostics_resetCounts_CommandInfo);
+     // Populate cluster
+     ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId), wiFiNetworkDiagnostics_ClusterCommandInfo);
+     clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
+     Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
+           Map<String, CommandParameter> windowCovering_downOrClose_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_downOrClose_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo windowCovering_downOrClose_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .downOrClose((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_downOrClose_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
+           Map<String, CommandParameter> windowCovering_goToLiftPercentage_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_goToLiftPercentage_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter = new CommandParameter("liftPercentageValue", int.class);
+                 windowCovering_goToLiftPercentage_commandParams.put("liftPercentageValue",windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter);
+                  
+                 CommandParameter windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter = new CommandParameter("liftPercent100thsValue", int.class);
+                 windowCovering_goToLiftPercentage_commandParams.put("liftPercent100thsValue",windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
+                 
+           // Populate commands
+           CommandInfo windowCovering_goToLiftPercentage_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .goToLiftPercentage((DefaultClusterCallback) callback
+                          ,  windowCovering_goToLiftPercentage_commandParams.get("liftPercentageValue") commandArguments.get("liftPercentageValue")
+                          ,  windowCovering_goToLiftPercentage_commandParams.get("liftPercent100thsValue") commandArguments.get("liftPercent100thsValue")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_goToLiftPercentage_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
+           Map<String, CommandParameter> windowCovering_goToLiftValue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_goToLiftValue_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter windowCovering_goToLiftValue_liftValue_commandParameter = new CommandParameter("liftValue", int.class);
+                 windowCovering_goToLiftValue_commandParams.put("liftValue",windowCovering_goToLiftValue_liftValue_commandParameter);
+                 
+           // Populate commands
+           CommandInfo windowCovering_goToLiftValue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .goToLiftValue((DefaultClusterCallback) callback
+                          ,  windowCovering_goToLiftValue_commandParams.get("liftValue") commandArguments.get("liftValue")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_goToLiftValue_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
+           Map<String, CommandParameter> windowCovering_goToTiltPercentage_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_goToTiltPercentage_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter = new CommandParameter("tiltPercentageValue", int.class);
+                 windowCovering_goToTiltPercentage_commandParams.put("tiltPercentageValue",windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter);
+                  
+                 CommandParameter windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter = new CommandParameter("tiltPercent100thsValue", int.class);
+                 windowCovering_goToTiltPercentage_commandParams.put("tiltPercent100thsValue",windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
+                 
+           // Populate commands
+           CommandInfo windowCovering_goToTiltPercentage_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .goToTiltPercentage((DefaultClusterCallback) callback
+                          ,  windowCovering_goToTiltPercentage_commandParams.get("tiltPercentageValue") commandArguments.get("tiltPercentageValue")
+                          ,  windowCovering_goToTiltPercentage_commandParams.get("tiltPercent100thsValue") commandArguments.get("tiltPercent100thsValue")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_goToTiltPercentage_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
+           Map<String, CommandParameter> windowCovering_goToTiltValue_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_goToTiltValue_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter windowCovering_goToTiltValue_tiltValue_commandParameter = new CommandParameter("tiltValue", int.class);
+                 windowCovering_goToTiltValue_commandParams.put("tiltValue",windowCovering_goToTiltValue_tiltValue_commandParameter);
+                 
+           // Populate commands
+           CommandInfo windowCovering_goToTiltValue_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .goToTiltValue((DefaultClusterCallback) callback
+                          ,  windowCovering_goToTiltValue_commandParams.get("tiltValue") commandArguments.get("tiltValue")
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_goToTiltValue_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
+           Map<String, CommandParameter> windowCovering_stopMotion_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_stopMotion_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo windowCovering_stopMotion_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .stopMotion((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_stopMotion_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
+           Map<String, CommandParameter> windowCovering_upOrOpen_commandParams = new HashMap<String, CommandParameter>();
+           // TODO: fill out parameter types
+                 CommandParameter windowCovering_upOrOpen_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+           // Populate commands
+           CommandInfo windowCovering_upOrOpen_CommandInfo = new CommandInfo(
+                   (cluster, callback, commandArguments) -> {
+                       ((ChipClusters.WindowCoveringCluster) cluster)
+                          .upOrOpen((DefaultClusterCallback) callback
+                );
+                   },
+                   () -> new DelegatedDefaultClusterCallback(),
+                   windowCovering_upOrOpen_commandParams
+           );
+           windowCovering_ClusterCommandInfo.put("upOrOpen", windowCovering_upOrOpen_CommandInfo);
+     // Populate cluster
+     ClusterInfo windowCovering_clusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId), windowCovering_ClusterCommandInfo);
+     clusterMap.put("windowCovering", windowCovering_clusterInfo);
+     return clusterMap;
+>>>>>>> e83b94d19 (need to wait for cast-helper)
   }
 }
+

From e7dda338f6cdcc81ec8419172d6cd7ad85d29e74 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Sat, 16 Oct 2021 16:58:19 -0400
Subject: [PATCH 06/38] callback generation done

---
 .../java/templates/ClusterInfo-java.zapt      |    65 +-
 .../java/zap-generated/CHIPClusters-JNI.cpp   | 25624 ++++++++++------
 .../chip/devicecontroller/ChipClusters.java   |  7442 +++--
 .../devicecontroller/ClusterInfoMapping.java  |  6125 +++-
 4 files changed, 26081 insertions(+), 13175 deletions(-)

diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index aa4dbed132c093..0050880f306393 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -185,6 +185,50 @@ public class ClusterInfoMapping {
       callback.onFailure(e);
     }
   }
+  {{#chip_client_clusters}}
+    {{#chip_cluster_responses}}
+      public class Delegated{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
+        private ClusterCommandCallback callback;
+
+        @Override
+        public void setCallbackDelegate(ClusterCommandCallback callback) {
+          this.callback = callback;
+        }
+        @Override
+        public void onSuccess(
+              {{#chip_cluster_response_arguments}}
+              {{#if isArray}}
+                  // {{asSymbol label}}: {{asUnderlyingZclType type}}
+                  // Conversion from this type to Java is not properly implemented yet
+              {{else if (isOctetString type)}}
+                  {{omitCommaForFirstNonStatusCommand parent.id index}}byte[] {{asSymbol label}}
+              {{else if (isShortString type)}}
+                  {{omitCommaForFirstNonStatusCommand parent.id index}}String {{asSymbol label}}
+              {{else}}
+                  {{omitCommaForFirstNonStatusCommand parent.id index}}{{asJavaBasicTypeForZclType type false}} {{asSymbol label}}
+              {{/if}}
+              {{/chip_cluster_response_arguments}}
+        ) {
+            List<Object> responseValues = new ArrayList<>();
+            {{#chip_cluster_response_arguments}}
+              {{#if isArray}}
+                // {{asSymbol label}}: {{asUnderlyingZclType type}}
+                // Conversion from this type to Java is not properly implemented yet
+              {{else}}
+              responseValues.add({{asSymbol label}});
+              {{/if}}
+            {{/chip_cluster_response_arguments}}
+            callback.onSuccess(responseValues);
+        }
+
+        @Override
+        public void onError(Exception error) {
+          callback.onFailure(error);
+        }
+      }
+
+    {{/chip_cluster_responses}}
+ {{/chip_client_clusters}}
 
  public Map<String, ClusterInfo> getClusterMap() {
      Map<String, ClusterInfo> clusterMap = new HashMap<>();
@@ -219,16 +263,7 @@ public class ClusterInfoMapping {
                            .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
                            {{#chip_cluster_command_arguments}}
                            ,
-                              {{#chip_client_clusters}}
-                              {{#chip_cluster_commands}}
-                              {{#chip_cluster_command_arguments}}
-
-                              {{asJavaBoxedType type}}
-
-                              {{/chip_cluster_command_arguments}}
-                              {{/chip_cluster_commands}}
-                              {{/chip_client_clusters}}
-
+                              ({{asJavaBoxedType type}})
                             commandArguments.get("{{asLowerCamelCase label}}")
                        {{/chip_cluster_command_arguments}}
                        );
@@ -243,15 +278,7 @@ public class ClusterInfoMapping {
                           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
                           {{#chip_cluster_command_arguments}}
                           ,
-                             {{#chip_client_clusters}}
-                             {{#chip_cluster_commands}}
-                             {{#chip_cluster_command_arguments}}
-
-                             {{asJavaBoxedType type}}
-
-                             {{/chip_cluster_command_arguments}}
-                             {{/chip_cluster_commands}}
-                             {{/chip_client_clusters}}
+                             ({{asJavaBoxedType type}})
                            commandArguments.get("{{asLowerCamelCase label}}")
                 {{/chip_cluster_command_arguments}}
                 );
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index 677205ae70ee00..75d3f2ad34c00c 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -17,21 +17,25 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
+<<<<<<< HEAD
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/data-model/DecodableList.h>
 #include <zap-generated/CHIPClusters.h>
+=======
+>>>>>>> e993d01f0 (callback generation done)
 #include <zap-generated/CHIPClientCallbacks.h>
+#include <zap-generated/CHIPClusters.h>
 
-#include <lib/support/CHIPJNIError.h>
-#include <lib/support/JniReferences.h>
-#include <lib/support/JniTypeWrappers.h>
 #include <jni.h>
 #include <lib/core/CHIPSafeCasts.h>
+#include <lib/support/CHIPJNIError.h>
 #include <lib/support/CodeUtils.h>
+#include <lib/support/JniReferences.h>
+#include <lib/support/JniTypeWrappers.h>
 #include <lib/support/Span.h>
 #include <platform/PlatformManager.h>
 
-#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                            \
+#define JNI_METHOD(RETURN, CLASS_NAME, METHOD_NAME)                                                                                \
     extern "C" JNIEXPORT RETURN JNICALL Java_chip_devicecontroller_ChipClusters_00024##CLASS_NAME##_##METHOD_NAME
 
 using namespace chip;
@@ -41,7 +45,8 @@ static CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthro
 static CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx);
 static void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode);
 
-CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable & outEx) {
+CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable & outEx)
+{
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID exceptionConstructor;
     jclass clusterExceptionCls;
@@ -49,17 +54,18 @@ CHIP_ERROR CreateChipClusterException(JNIEnv * env, jint errorCode, jthrowable &
     err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusterException", clusterExceptionCls);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
     JniClass clusterExceptionJniCls(clusterExceptionCls);
-    
+
     exceptionConstructor = env->GetMethodID(clusterExceptionCls, "<init>", "(I)V");
     VerifyOrReturnError(exceptionConstructor != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-    
+
     outEx = (jthrowable) env->NewObject(clusterExceptionCls, exceptionConstructor, errorCode);
     VerifyOrReturnError(outEx != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
 
     return err;
 }
 
-CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx) {
+CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipError errorCode, jthrowable & outEx)
+{
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID exceptionConstructor;
     jclass exceptionClass;
@@ -68,10 +74,10 @@ CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipE
     err = JniReferences::GetInstance().GetClassRef(env, "java/lang/IllegalStateException", exceptionClass);
     VerifyOrReturnError(err == CHIP_NO_ERROR, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
     JniClass exceptionJniClass(exceptionClass);
-    
+
     exceptionConstructor = env->GetMethodID(exceptionClass, "<init>", "(Ljava/lang/String;)V");
     VerifyOrReturnError(exceptionConstructor != nullptr, CHIP_JNI_ERROR_TYPE_NOT_FOUND);
-    
+
     char buf[CHIP_CONFIG_LOG_MESSAGE_MAX_SIZE];
     snprintf(buf, sizeof(buf), "%s: %d", message, errorCode.AsInteger());
     errStr = env->NewStringUTF(buf);
@@ -82,20 +88,23 @@ CHIP_ERROR CreateIllegalStateException(JNIEnv * env, const char message[], ChipE
     return err;
 }
 
-void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode) {
+void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char message[], ChipError errorCode)
+{
     VerifyOrReturn(callback == nullptr, ChipLogDetail(Zcl, "Callback is null in ReturnIllegalStateException(), exiting early"));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
     jmethodID method;
     err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-    if (err != CHIP_NO_ERROR) {
+    if (err != CHIP_NO_ERROR)
+    {
         ChipLogError(Zcl, "Error throwing IllegalStateException %d", err.AsInteger());
         return;
     }
 
     jthrowable exception;
     err = CreateIllegalStateException(env, message, errorCode, exception);
-    if (err != CHIP_NO_ERROR) {
+    if (err != CHIP_NO_ERROR)
+    {
         ChipLogError(Zcl, "Error throwing IllegalStateException %d", err.AsInteger());
         return;
     }
@@ -103,201 +112,215 @@ void ReturnIllegalStateException(JNIEnv * env, jobject callback, const char mess
 }
 
 // TODO(#8773): Clean up callbacks.
-class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallback> {
-    public:
-        CHIPDefaultSuccessCallback(jobject javaCallback): Callback::Callback<DefaultSuccessCallback>(CallbackFn, this)
+class CHIPDefaultSuccessCallback : public Callback::Callback<DefaultSuccessCallback>
+{
+public:
+    CHIPDefaultSuccessCallback(jobject javaCallback) : Callback::Callback<DefaultSuccessCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        ~CHIPDefaultSuccessCallback()
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
 
-        static void CallbackFn(void * context)
+    ~CHIPDefaultSuccessCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            jmethodID javaMethod;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            CHIPDefaultSuccessCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+    static void CallbackFn(void * context)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        jmethodID javaMethod;
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        CHIPDefaultSuccessCallback * cppCallback = nullptr;
 
-            cppCallback = reinterpret_cast<CHIPDefaultSuccessCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        cppCallback = reinterpret_cast<CHIPDefaultSuccessCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
-            SuccessOrExit(err);
-        
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod);
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod);
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-    
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallback> {
-    public:
-        CHIPDefaultFailureCallback(jobject javaCallback): Callback::Callback<DefaultFailureCallback>(CallbackFn, this)
+class CHIPDefaultFailureCallback : public Callback::Callback<DefaultFailureCallback>
+{
+public:
+    CHIPDefaultFailureCallback(jobject javaCallback) : Callback::Callback<DefaultFailureCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        ~CHIPDefaultFailureCallback()
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
 
-        static void CallbackFn(void * context, uint8_t status)
+    ~CHIPDefaultFailureCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            jmethodID javaMethod;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jthrowable exception;
-            CHIPDefaultFailureCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        jmethodID javaMethod;
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jthrowable exception;
+        CHIPDefaultFailureCallback * cppCallback = nullptr;
 
-            cppCallback = reinterpret_cast<CHIPDefaultFailureCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        cppCallback = reinterpret_cast<CHIPDefaultFailureCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onError", "(Ljava/lang/Exception;)V", &javaMethod);
-            SuccessOrExit(err);
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = CreateChipClusterException(env, status, exception);
-            SuccessOrExit(err);
-        
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, exception);
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-        }
-    
-    private:
-        jobject javaCallbackRef;
-};
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onError", "(Ljava/lang/Exception;)V", &javaMethod);
+        SuccessOrExit(err);
 
+        err = CreateChipClusterException(env, status, exception);
+        SuccessOrExit(err);
 
-class CHIPBooleanAttributeCallback : public Callback::Callback<BooleanAttributeCallback> {
-    public:
-        CHIPBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<BooleanAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, exception);
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
         }
+    }
 
-        static void maybeDestroy(CHIPBooleanAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPBooleanAttributeCallback : public Callback::Callback<BooleanAttributeCallback>
+{
+public:
+    CHIPBooleanAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<BooleanAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, bool value)
+    static void maybeDestroy(CHIPBooleanAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    static void CallbackFn(void * context, bool value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            std::unique_ptr<CHIPBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPBooleanAttributeCallback *>(context), maybeDestroy);
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        std::unique_ptr<CHIPBooleanAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPBooleanAttributeCallback *>(context), maybeDestroy);
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Z)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(value));
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Z)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jboolean>(value));
+    }
 
-        }
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
-};
-
-class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttributeCallback> {
-    public:
-        CHIPCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<CharStringAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttributeCallback>
+{
+public:
+    CHIPCharStringAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<CharStringAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
+<<<<<<< HEAD
 
         static void maybeDestroy(CHIPCharStringAttributeCallback * callback) {
             if (!callback->keepAlive) {
@@ -307,507 +330,572 @@ class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttr
         }
 
         static void CallbackFn(void * context, const chip::CharSpan value)
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+>>>>>>> e993d01f0 (callback generation done)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
 
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    static void maybeDestroy(CHIPCharStringAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
+        {
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPCharStringAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, const chip::ByteSpan value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
+        std::unique_ptr<CHIPCharStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPCharStringAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        jmethodID javaMethod;
 
-            UtfString valueStr(env, value);
-            env->CallVoidMethod(javaCallbackRef, javaMethod, valueStr.jniValue());
-        }
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+        UtfString valueStr(env, value);
+        env->CallVoidMethod(javaCallbackRef, javaMethod, valueStr.jniValue());
+    }
+
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt8sAttributeCallback : public Callback::Callback<Int8sAttributeCallback> {
-    public:
-        CHIPInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int8sAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt8sAttributeCallback : public Callback::Callback<Int8sAttributeCallback>
+{
+public:
+    CHIPInt8sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int8sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt8sAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, int8_t value)
+    static void maybeDestroy(CHIPInt8sAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt8sAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, int8_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+        std::unique_ptr<CHIPInt8sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt8sAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt8uAttributeCallback : public Callback::Callback<Int8uAttributeCallback> {
-    public:
-        CHIPInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int8uAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt8uAttributeCallback : public Callback::Callback<Int8uAttributeCallback>
+{
+public:
+    CHIPInt8uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int8uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt8uAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, uint8_t value)
+    static void maybeDestroy(CHIPInt8uAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt8uAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, uint8_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+        std::unique_ptr<CHIPInt8uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt8uAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt16sAttributeCallback : public Callback::Callback<Int16sAttributeCallback> {
-    public:
-        CHIPInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int16sAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt16sAttributeCallback : public Callback::Callback<Int16sAttributeCallback>
+{
+public:
+    CHIPInt16sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int16sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt16sAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, int16_t value)
+    static void maybeDestroy(CHIPInt16sAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt16sAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, int16_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+        std::unique_ptr<CHIPInt16sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt16sAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt16uAttributeCallback : public Callback::Callback<Int16uAttributeCallback> {
-    public:
-        CHIPInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int16uAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt16uAttributeCallback : public Callback::Callback<Int16uAttributeCallback>
+{
+public:
+    CHIPInt16uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int16uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt16uAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, uint16_t value)
+    static void maybeDestroy(CHIPInt16uAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    static void CallbackFn(void * context, uint16_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            std::unique_ptr<CHIPInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt16uAttributeCallback *>(context), maybeDestroy);
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        std::unique_ptr<CHIPInt16uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt16uAttributeCallback *>(context), maybeDestroy);
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(value));
+    }
 
-        }
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
+};
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
-};
-
-class CHIPInt32sAttributeCallback : public Callback::Callback<Int32sAttributeCallback> {
-    public:
-        CHIPInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int32sAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt32sAttributeCallback : public Callback::Callback<Int32sAttributeCallback>
+{
+public:
+    CHIPInt32sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int32sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt32sAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, int32_t value)
+    static void maybeDestroy(CHIPInt32sAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt32sAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, int32_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+        std::unique_ptr<CHIPInt32sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt32sAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt32uAttributeCallback : public Callback::Callback<Int32uAttributeCallback> {
-    public:
-        CHIPInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int32uAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt32uAttributeCallback : public Callback::Callback<Int32uAttributeCallback>
+{
+public:
+    CHIPInt32uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int32uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt32uAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, uint32_t value)
+    static void maybeDestroy(CHIPInt32uAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt32uAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, uint32_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+        std::unique_ptr<CHIPInt32uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt32uAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt64sAttributeCallback : public Callback::Callback<Int64sAttributeCallback> {
-    public:
-        CHIPInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int64sAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt64sAttributeCallback : public Callback::Callback<Int64sAttributeCallback>
+{
+public:
+    CHIPInt64sAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int64sAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt64sAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, int64_t value)
+    static void maybeDestroy(CHIPInt64sAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt64sAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, int64_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+        std::unique_ptr<CHIPInt64sAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt64sAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPInt64uAttributeCallback : public Callback::Callback<Int64uAttributeCallback> {
-    public:
-        CHIPInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<Int64uAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPInt64uAttributeCallback : public Callback::Callback<Int64uAttributeCallback>
+{
+public:
+    CHIPInt64uAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<Int64uAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPInt64uAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, uint64_t value)
+    static void maybeDestroy(CHIPInt64uAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            std::unique_ptr<CHIPInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPInt64uAttributeCallback *>(context), maybeDestroy);
+    static void CallbackFn(void * context, uint64_t value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
-            env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+        std::unique_ptr<CHIPInt64uAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPInt64uAttributeCallback *>(context), maybeDestroy);
 
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-        }
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(J)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jlong>(value));
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
-class CHIPOctetStringAttributeCallback : public Callback::Callback<OctetStringAttributeCallback> {
-    public:
-        CHIPOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false): Callback::Callback<OctetStringAttributeCallback>(CallbackFn, this)
-        , keepAlive(keepAlive)
+class CHIPOctetStringAttributeCallback : public Callback::Callback<OctetStringAttributeCallback>
+{
+public:
+    CHIPOctetStringAttributeCallback(jobject javaCallback, bool keepAlive = false) :
+        Callback::Callback<OctetStringAttributeCallback>(CallbackFn, this), keepAlive(keepAlive)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-
-        static void maybeDestroy(CHIPOctetStringAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
+    }
 
-        static void CallbackFn(void * context, const chip::ByteSpan value)
+    static void maybeDestroy(CHIPOctetStringAttributeCallback * callback)
+    {
+        if (!callback->keepAlive)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
+            callback->Cancel();
+            delete callback;
+        }
+    }
 
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+    static void CallbackFn(void * context, const chip::ByteSpan value)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
 
-            std::unique_ptr<CHIPOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(reinterpret_cast<CHIPOctetStringAttributeCallback *>(context), maybeDestroy);
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
+        std::unique_ptr<CHIPOctetStringAttributeCallback, decltype(&maybeDestroy)> cppCallback(
+            reinterpret_cast<CHIPOctetStringAttributeCallback *>(context), maybeDestroy);
 
-            jmethodID javaMethod;
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        jobject javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogDetail(Zcl, "Early return from attribute callback since Java callback is null"));
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
+        jmethodID javaMethod;
 
-            jbyteArray valueArr = env->NewByteArray(value.size());
-            env->ExceptionClear();
-            env->SetByteArrayRegion(valueArr, 0, value.size(), reinterpret_cast<const jbyte *>(value.data()));
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess method"));
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod, valueArr);
+        jbyteArray valueArr = env->NewByteArray(value.size());
+        env->ExceptionClear();
+        env->SetByteArrayRegion(valueArr, 0, value.size(), reinterpret_cast<const jbyte *>(value.data()));
 
-        }
+        env->CallVoidMethod(javaCallbackRef, javaMethod, valueArr);
+    }
 
-    private:
-        jobject javaCallbackRef;
-        bool keepAlive;
+private:
+    jobject javaCallbackRef;
+    bool keepAlive;
 };
 
 class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>
 {
-    public:
-        CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback): Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>(CallbackFn, this)
+public:
+    CHIPAccountLoginClusterGetSetupPINResponseCallback(jobject javaCallback) :
+        Callback::Callback<AccountLoginClusterGetSetupPINResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPAccountLoginClusterGetSetupPINResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -851,30 +939,80 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Call
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPAccountLoginClusterGetSetupPINResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t * setupPIN)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPAccountLoginClusterGetSetupPINResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString setupPINStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, setupPINStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPApplicationLauncherClusterLaunchAppResponseCallback : public Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>
+class CHIPApplicationLauncherClusterLaunchAppResponseCallback
+    : public Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>
 {
-    public:
-        CHIPApplicationLauncherClusterLaunchAppResponseCallback(jobject javaCallback): Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>(CallbackFn, this)
+public:
+    CHIPApplicationLauncherClusterLaunchAppResponseCallback(jobject javaCallback) :
+        Callback::Callback<ApplicationLauncherClusterLaunchAppResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPApplicationLauncherClusterLaunchAppResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -919,30 +1057,80 @@ class CHIPApplicationLauncherClusterLaunchAppResponseCallback : public Callback:
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPApplicationLauncherClusterLaunchAppResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint8_t * data)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPApplicationLauncherClusterLaunchAppResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString dataStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPApplicationLauncherClusterLaunchAppResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), dataStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchContentResponseCallback : public Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>
+class CHIPContentLauncherClusterLaunchContentResponseCallback
+    : public Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>
 {
-    public:
-        CHIPContentLauncherClusterLaunchContentResponseCallback(jobject javaCallback): Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>(CallbackFn, this)
+public:
+    CHIPContentLauncherClusterLaunchContentResponseCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherClusterLaunchContentResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPContentLauncherClusterLaunchContentResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -987,30 +1175,80 @@ class CHIPContentLauncherClusterLaunchContentResponseCallback : public Callback:
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPContentLauncherClusterLaunchContentResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPContentLauncherClusterLaunchContentResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString dataStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchContentResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, dataStr.jniValue(), static_cast<jint>(contentLaunchStatus));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherClusterLaunchURLResponseCallback : public Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>
+class CHIPContentLauncherClusterLaunchURLResponseCallback
+    : public Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>
 {
-    public:
-        CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback): Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>(CallbackFn, this)
+public:
+    CHIPContentLauncherClusterLaunchURLResponseCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherClusterLaunchURLResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPContentLauncherClusterLaunchURLResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -1055,24 +1293,74 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback : public Callback::Cal
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPContentLauncherClusterLaunchURLResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
+        jmethodID javaMethod;
+        CHIPContentLauncherClusterLaunchURLResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString dataStr(env, "");
 
-class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
-{
-    public:
-        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback): Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
+        cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchURLResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, dataStr.jniValue(), static_cast<jint>(contentLaunchStatus));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
+{
+    public:
+        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback): Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
+        {
+            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+            if (env == nullptr) {
+                ChipLogError(Zcl, "Could not create global reference for Java callback");
+                return;
+            }
+
+            javaCallbackRef = env->NewGlobalRef(javaCallback);
             if (javaCallbackRef == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
             }
@@ -1139,1457 +1427,1636 @@ class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback : public Callback::C
 
 class CHIPDoorLockClusterClearAllPinsResponseCallback : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearAllPinsResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearAllPinsResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearAllPinsResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearAllPinsResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearAllPinsResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllPinsResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterClearAllRfidsResponseCallback : public Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearAllRfidsResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearAllRfidsResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearAllRfidsResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearAllRfidsResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearAllRfidsResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearAllRfidsResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearAllRfidsResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
+class CHIPDoorLockClusterClearHolidayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearHolidayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearHolidayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearHolidayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearHolidayScheduleResponseCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearHolidayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearHolidayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterClearPinResponseCallback : public Callback::Callback<DoorLockClusterClearPinResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearPinResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearPinResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearPinResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearPinResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearPinResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearPinResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearPinResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterClearRfidResponseCallback : public Callback::Callback<DoorLockClusterClearRfidResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearRfidResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearRfidResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearRfidResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearRfidResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearRfidResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearRfidResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearRfidResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
+class CHIPDoorLockClusterClearWeekdayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearWeekdayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearWeekdayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearWeekdayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearWeekdayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterClearYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
+class CHIPDoorLockClusterClearYeardayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterClearYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterClearYeardayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterClearYeardayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterClearYeardayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterClearYeardayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterClearYeardayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterClearYeardayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterClearYeardayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
+class CHIPDoorLockClusterGetHolidayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetHolidayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetHolidayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime, uint8_t operatingModeDuringHoliday)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetHolidayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterGetHolidayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t scheduleId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime,
+                           uint8_t operatingModeDuringHoliday)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIJJI)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetHolidayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(scheduleId)
-                                , static_cast<jint>(status)
-                                , static_cast<jlong>(localStartTime)
-                                , static_cast<jlong>(localEndTime)
-                                , static_cast<jint>(operatingModeDuringHoliday)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIJJI)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(status),
+                            static_cast<jlong>(localStartTime), static_cast<jlong>(localEndTime),
+                            static_cast<jint>(operatingModeDuringHoliday));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterGetLogRecordResponseCallback : public Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetLogRecordResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetLogRecordResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterGetLogRecordResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source, uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetLogRecordResponseCallback * cppCallback = nullptr;
-            jbyteArray pinArr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterGetLogRecordResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+    static void CallbackFn(void * context, uint16_t logEntryId, uint32_t timestamp, uint8_t eventType, uint8_t source,
+                           uint8_t eventIdOrAlarmCode, uint16_t userId, chip::ByteSpan pin)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetLogRecordResponseCallback * cppCallback = nullptr;
+        jbyteArray pinArr;
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetLogRecordResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJIIII[B)V", &javaMethod);
-            SuccessOrExit(err);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            pinArr = env->NewByteArray(pin.size());
-            VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJIIII[B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(logEntryId)
-                                , static_cast<jlong>(timestamp)
-                                , static_cast<jint>(eventType)
-                                , static_cast<jint>(source)
-                                , static_cast<jint>(eventIdOrAlarmCode)
-                                , static_cast<jint>(userId)
-                                , pinArr
-            );
+        pinArr = env->NewByteArray(pin.size());
+        VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->DeleteLocalRef(pinArr);
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(logEntryId), static_cast<jlong>(timestamp),
+                            static_cast<jint>(eventType), static_cast<jint>(source), static_cast<jint>(eventIdOrAlarmCode),
+                            static_cast<jint>(userId), pinArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+        env->DeleteLocalRef(pinArr);
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterGetPinResponseCallback : public Callback::Callback<DoorLockClusterGetPinResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetPinResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetPinResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPDoorLockClusterGetPinResponseCallback()
+    }
+    ~CHIPDoorLockClusterGetPinResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetPinResponseCallback * cppCallback = nullptr;
-            jbyteArray pinArr;
+    static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan pin)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetPinResponseCallback * cppCallback = nullptr;
+        jbyteArray pinArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetPinResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            pinArr = env->NewByteArray(pin.size());
-            VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        pinArr = env->NewByteArray(pin.size());
+        VerifyOrExit(pinArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(pinArr, 0, pin.size(), reinterpret_cast<const jbyte *>(pin.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(userId)
-                                , static_cast<jint>(userStatus)
-                                , static_cast<jint>(userType)
-                                , pinArr
-            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userStatus),
+                            static_cast<jint>(userType), pinArr);
 
-            env->DeleteLocalRef(pinArr);
+        env->DeleteLocalRef(pinArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterGetRfidResponseCallback : public Callback::Callback<DoorLockClusterGetRfidResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetRfidResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetRfidResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPDoorLockClusterGetRfidResponseCallback()
+    }
+    ~CHIPDoorLockClusterGetRfidResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetRfidResponseCallback * cppCallback = nullptr;
-            jbyteArray rfidArr;
+    static void CallbackFn(void * context, uint16_t userId, uint8_t userStatus, uint8_t userType, chip::ByteSpan rfid)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetRfidResponseCallback * cppCallback = nullptr;
+        jbyteArray rfidArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetRfidResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III[B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            rfidArr = env->NewByteArray(rfid.size());
-            VerifyOrExit(rfidArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(rfidArr, 0, rfid.size(), reinterpret_cast<const jbyte *>(rfid.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        rfidArr = env->NewByteArray(rfid.size());
+        VerifyOrExit(rfidArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(rfidArr, 0, rfid.size(), reinterpret_cast<const jbyte *>(rfid.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(userId)
-                                , static_cast<jint>(userStatus)
-                                , static_cast<jint>(userType)
-                                , rfidArr
-            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userStatus),
+                            static_cast<jint>(userType), rfidArr);
 
-            env->DeleteLocalRef(rfidArr);
+        env->DeleteLocalRef(rfidArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterGetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetUserTypeResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetUserTypeResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterGetUserTypeResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetUserTypeResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterGetUserTypeResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint16_t userId, uint8_t userType)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetUserTypeResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetUserTypeResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(userId)
-                                , static_cast<jint>(userType)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(userId), static_cast<jint>(userType));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
+class CHIPDoorLockClusterGetWeekdayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetWeekdayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetWeekdayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour, uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetWeekdayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterGetWeekdayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint8_t daysMask, uint8_t startHour,
+                           uint8_t startMinute, uint8_t endHour, uint8_t endMinute)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIIIIII)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(scheduleId)
-                                , static_cast<jint>(userId)
-                                , static_cast<jint>(status)
-                                , static_cast<jint>(daysMask)
-                                , static_cast<jint>(startHour)
-                                , static_cast<jint>(startMinute)
-                                , static_cast<jint>(endHour)
-                                , static_cast<jint>(endMinute)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIIIIII)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(userId),
+                            static_cast<jint>(status), static_cast<jint>(daysMask), static_cast<jint>(startHour),
+                            static_cast<jint>(startMinute), static_cast<jint>(endHour), static_cast<jint>(endMinute));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterGetYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
+class CHIPDoorLockClusterGetYeardayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterGetYeardayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterGetYeardayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterGetYeardayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime, uint32_t localEndTime)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterGetYeardayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterGetYeardayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t scheduleId, uint16_t userId, uint8_t status, uint32_t localStartTime,
+                           uint32_t localEndTime)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterGetYeardayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIJJ)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterGetYeardayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(scheduleId)
-                                , static_cast<jint>(userId)
-                                , static_cast<jint>(status)
-                                , static_cast<jlong>(localStartTime)
-                                , static_cast<jlong>(localEndTime)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIJJ)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(scheduleId), static_cast<jint>(userId),
+                            static_cast<jint>(status), static_cast<jlong>(localStartTime), static_cast<jlong>(localEndTime));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterLockDoorResponseCallback : public Callback::Callback<DoorLockClusterLockDoorResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterLockDoorResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterLockDoorResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterLockDoorResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterLockDoorResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterLockDoorResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterLockDoorResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterLockDoorResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetHolidayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
+class CHIPDoorLockClusterSetHolidayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterSetHolidayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetHolidayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterSetHolidayScheduleResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetHolidayScheduleResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterSetHolidayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetHolidayScheduleResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetHolidayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterSetPinResponseCallback : public Callback::Callback<DoorLockClusterSetPinResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterSetPinResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetPinResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterSetPinResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetPinResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterSetPinResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetPinResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetPinResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterSetRfidResponseCallback : public Callback::Callback<DoorLockClusterSetRfidResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
-        }
-        ~CHIPDoorLockClusterSetRfidResponseCallback()
+public:
+    CHIPDoorLockClusterSetRfidResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetRfidResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetRfidResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterSetRfidResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetRfidResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetRfidResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterSetUserTypeResponseCallback : public Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterSetUserTypeResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetUserTypeResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterSetUserTypeResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetUserTypeResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterSetUserTypeResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetUserTypeResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetUserTypeResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
+class CHIPDoorLockClusterSetWeekdayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterSetWeekdayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetWeekdayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback()
+    }
+    ~CHIPDoorLockClusterSetWeekdayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint8_t status)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetWeekdayScheduleResponseCallback * cppCallback = nullptr;
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetWeekdayScheduleResponseCallback * cppCallback = nullptr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
+private:
+    jobject javaCallbackRef;
+};
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+class CHIPDoorLockClusterSetYeardayScheduleResponseCallback
+    : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
+{
+public:
+    CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        
-    private:
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterSetYeardayScheduleResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterSetYeardayScheduleResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterSetYeardayScheduleResponseCallback : public Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>
+class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterSetYeardayScheduleResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterSetYeardayScheduleResponseCallback>(CallbackFn, this)
+public:
+    CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPDoorLockClusterSetYeardayScheduleResponseCallback()
+    }
+    ~CHIPDoorLockClusterUnlockDoorResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint8_t status)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterSetYeardayScheduleResponseCallback * cppCallback = nullptr;
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterUnlockDoorResponseCallback * cppCallback = nullptr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterSetYeardayScheduleResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
+private:
+    jobject javaCallbackRef;
+};
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback
+    : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
+{
+public:
+    CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback) :
+        Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        
-    private:
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDoorLockClusterUnlockWithTimeoutResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>
+class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
+    : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
 {
-    public:
-        CHIPDoorLockClusterUnlockDoorResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterUnlockDoorResponseCallback>(CallbackFn, this)
+public:
+    CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback) :
+        Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterUnlockDoorResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -2598,30 +3065,32 @@ class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<
             env->DeleteGlobalRef(javaCallbackRef);
         };
 
-        static void CallbackFn(void * context, uint8_t status)
+        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
             jmethodID javaMethod;
-            CHIPDoorLockClusterUnlockDoorResponseCallback * cppCallback = nullptr;
-
+            CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
+            UtfString debugTextStr(env, debugText);
+            
             VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockDoorResponseCallback *>(context);
+            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
             VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
             javaCallbackRef = cppCallback->javaCallbackRef;
             VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
             SuccessOrExit(err);
 
 
             env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+                , static_cast<jint>(errorCode)
+                                , debugTextStr.jniValue()
+            );
 
 
         exit:
@@ -2632,96 +3101,80 @@ class CHIPDoorLockClusterUnlockDoorResponseCallback : public Callback::Callback<
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPDoorLockClusterUnlockWithTimeoutResponseCallback : public Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>
-{
-    public:
-        CHIPDoorLockClusterUnlockWithTimeoutResponseCallback(jobject javaCallback): Callback::Callback<DoorLockClusterUnlockWithTimeoutResponseCallback>(CallbackFn, this)
+    }
+    ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPDoorLockClusterUnlockWithTimeoutResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDoorLockClusterUnlockWithTimeoutResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback : public Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>
+class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
+    : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
 {
-    public:
-        CHIPGeneralCommissioningClusterArmFailSafeResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterArmFailSafeResponseCallback>(CallbackFn, this)
+public:
+    CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) :
+        Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -2737,12 +3190,12 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback : public Callba
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
             jmethodID javaMethod;
-            CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
+            CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
             UtfString debugTextStr(env, debugText);
             
             VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
+            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
             VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
             javaCallbackRef = cppCallback->javaCallbackRef;
@@ -2766,98 +3219,80 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback : public Callba
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback : public Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>
-{
-    public:
-        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterCommissioningCompleteResponseCallback>(CallbackFn, this)
+    }
+    ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback : public Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>
+class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
+    : public Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>
 {
-    public:
-        CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(CallbackFn, this)
+public:
+    CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback) :
+        Callback::Callback<GeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -2902,97 +3337,288 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback : publi
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
-{
-    public:
-        CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
+    }
+    ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPGroupsClusterAddGroupResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGroupsClusterAddGroupResponseCallback * cppCallback = nullptr;
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                            );
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
+private:
+    jobject javaCallbackRef;
+};
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+class CHIPGroupsClusterAddGroupResponseCallback : public Callback::Callback<GroupsClusterAddGroupResponseCallback>
+{
+public:
+    CHIPGroupsClusterAddGroupResponseCallback(jobject javaCallback) :
+        Callback::Callback<GroupsClusterAddGroupResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        
-    private:
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPGroupsClusterAddGroupResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGroupsClusterAddGroupResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPGroupsClusterAddGroupResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPGroupsClusterGetGroupMembershipResponseCallback : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
+class CHIPGroupsClusterGetGroupMembershipResponseCallback
+    : public Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>
 {
-    public:
-        CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
+public:
+    CHIPGroupsClusterGetGroupMembershipResponseCallback(jobject javaCallback) :
+        Callback::Callback<GroupsClusterGetGroupMembershipResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPGroupsClusterGetGroupMembershipResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount,
+                           /* TYPE WARNING: array array defaults to */ uint8_t * groupList)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGroupsClusterGetGroupMembershipResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(capacity), static_cast<jint>(groupCount)
+                            // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+        );
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
+{
+public:
+    CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback) :
+        Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPGroupsClusterRemoveGroupResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGroupsClusterRemoveGroupResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
+{
+public:
+    CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback) :
+        Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPGroupsClusterGetGroupMembershipResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -3001,32 +3627,32 @@ class CHIPGroupsClusterGetGroupMembershipResponseCallback : public Callback::Cal
             env->DeleteGlobalRef(javaCallbackRef);
         };
 
-        static void CallbackFn(void * context, uint8_t capacity, uint8_t groupCount, /* TYPE WARNING: array array defaults to */ uint8_t *  groupList)
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
             jmethodID javaMethod;
-            CHIPGroupsClusterGetGroupMembershipResponseCallback * cppCallback = nullptr;
-
+            CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
+            UtfString groupNameStr(env, groupName);
+            
             VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPGroupsClusterGetGroupMembershipResponseCallback *>(context);
+            cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
             VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
             javaCallbackRef = cppCallback->javaCallbackRef;
             VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
             SuccessOrExit(err);
 
 
             env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(capacity)
-                                , static_cast<jint>(groupCount)
-                                // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , groupNameStr.jniValue()
             );
 
 
@@ -3038,1024 +3664,971 @@ class CHIPGroupsClusterGetGroupMembershipResponseCallback : public Callback::Cal
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPGroupsClusterRemoveGroupResponseCallback : public Callback::Callback<GroupsClusterRemoveGroupResponseCallback>
-{
-    public:
-        CHIPGroupsClusterRemoveGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterRemoveGroupResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
-        }
-        ~CHIPGroupsClusterRemoveGroupResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+    }
+    ~CHIPGroupsClusterViewGroupResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGroupsClusterRemoveGroupResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGroupsClusterRemoveGroupResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t * groupName)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString groupNameStr(env, "");
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-            SuccessOrExit(err);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
+        cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                            );
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-        }
-        
-    private:
-        jobject javaCallbackRef;
-};
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
+                            groupNameStr.jniValue());
 
-class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<GroupsClusterViewGroupResponseCallback>
-{
-    public:
-        CHIPGroupsClusterViewGroupResponseCallback(jobject javaCallback): Callback::Callback<GroupsClusterViewGroupResponseCallback>(CallbackFn, this)
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        ~CHIPGroupsClusterViewGroupResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
+        if (cppCallback != nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
-            UtfString groupNameStr(env, groupName);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , groupNameStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+            cppCallback->Cancel();
+            delete cppCallback;
         }
-        
-    private:
-        jobject javaCallbackRef;
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPIdentifyClusterIdentifyQueryResponseCallback : public Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>
 {
-    public:
-        CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback): Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
+public:
+    CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback) :
+        Callback::Callback<IdentifyClusterIdentifyQueryResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPIdentifyClusterIdentifyQueryResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint16_t timeout)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPIdentifyClusterIdentifyQueryResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPIdentifyClusterIdentifyQueryResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint16_t timeout)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPIdentifyClusterIdentifyQueryResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPIdentifyClusterIdentifyQueryResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(timeout)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(timeout));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback<KeypadInputClusterSendKeyResponseCallback>
 {
-    public:
-        CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback): Callback::Callback<KeypadInputClusterSendKeyResponseCallback>(CallbackFn, this)
+public:
+    CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback) :
+        Callback::Callback<KeypadInputClusterSendKeyResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPKeypadInputClusterSendKeyResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPKeypadInputClusterSendKeyResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPKeypadInputClusterSendKeyResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPKeypadInputClusterSendKeyResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPKeypadInputClusterSendKeyResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>
+class CHIPMediaPlaybackClusterMediaFastForwardResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaFastForwardResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaFastForwardResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaFastForwardResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaFastForwardResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaFastForwardResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaPlaybackClusterMediaNextResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaNextResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaNextResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaNextResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaNextResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaNextResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaNextResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaNextResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaNextResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaPlaybackClusterMediaPauseResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaPauseResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaPauseResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaPauseResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaPauseResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaPauseResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPauseResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaPauseResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPauseResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaPlaybackClusterMediaPlayResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaPlayResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaPlayResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaPlayResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaPlayResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaPlayResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPlayResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaPlayResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPlayResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPMediaPlaybackClusterMediaPreviousResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>
+class CHIPMediaPlaybackClusterMediaPreviousResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaPreviousResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaPreviousResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaPreviousResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaPreviousResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPreviousResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaPreviousResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaPreviousResponseCallback * cppCallback = nullptr;
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaPreviousResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-        }
-        
-    private:
-        jobject javaCallbackRef;
-};
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-class CHIPMediaPlaybackClusterMediaRewindResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>
-{
-    public:
-        CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>(CallbackFn, this)
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        ~CHIPMediaPlaybackClusterMediaRewindResponseCallback()
+        if (cppCallback != nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPMediaPlaybackClusterMediaRewindResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>
+{
+public:
+    CHIPMediaPlaybackClusterMediaRewindResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaRewindResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaRewindResponseCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaRewindResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaRewindResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaRewindResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaRewindResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaPlaybackClusterMediaSeekResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaSeekResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaSeekResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaSeekResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaSeekResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaSeekResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSeekResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaSeekResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSeekResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>
+class CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaSkipBackwardResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback * cppCallback = nullptr;
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-        }
-        
-    private:
-        jobject javaCallbackRef;
-};
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>
-{
-    public:
-        CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(CallbackFn, this)
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        ~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback()
+        if (cppCallback != nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+class CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>
+{
+public:
+    CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaSkipForwardResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPMediaPlaybackClusterMediaStartOverResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>
+class CHIPMediaPlaybackClusterMediaStartOverResponseCallback
+    : public Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaStartOverResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaStartOverResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaStartOverResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaStartOverResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaStartOverResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaStartOverResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStartOverResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaStartOverResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStartOverResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaPlaybackClusterMediaStopResponseCallback : public Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>
 {
-    public:
-        CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback): Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>(CallbackFn, this)
+public:
+    CHIPMediaPlaybackClusterMediaStopResponseCallback(jobject javaCallback) :
+        Callback::Callback<MediaPlaybackClusterMediaStopResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPMediaPlaybackClusterMediaStopResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPMediaPlaybackClusterMediaStopResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPMediaPlaybackClusterMediaStopResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStopResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t mediaPlaybackStatus)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPMediaPlaybackClusterMediaStopResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPMediaPlaybackClusterMediaStopResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(mediaPlaybackStatus)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(mediaPlaybackStatus));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+public:
+    CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterAddThreadNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4100,30 +4673,80 @@ class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback : public C
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterAddWiFiNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4168,30 +4791,80 @@ class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback : public Cal
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterDisableNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterDisableNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterDisableNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterDisableNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4236,30 +4909,80 @@ class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback : public Cal
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterDisableNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterDisableNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterEnableNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterEnableNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterEnableNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterEnableNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4304,30 +5027,80 @@ class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback : public Call
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterEnableNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterEnableNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
 
-class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>
-{
-    public:
-        CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>(CallbackFn, this)
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>
+{
+public:
+    CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterRemoveNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4372,30 +5145,80 @@ class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback : public Call
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterScanNetworksResponseCallback : public Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>
+class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterScanNetworksResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterScanNetworksResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4444,30 +5267,87 @@ class CHIPNetworkCommissioningClusterScanNetworksResponseCallback : public Callb
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText,
+                           /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
+                           /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterScanNetworksResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue()
+                            // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+                            // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+        );
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4512,30 +5392,80 @@ class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback : publi
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback : public Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>
+class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
+    : public Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>
 {
-    public:
-        CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(jobject javaCallback): Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(CallbackFn, this)
+public:
+    CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback(jobject javaCallback) :
+        Callback::Callback<NetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4580,97 +5510,149 @@ class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback : public
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+    ~CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString debugTextStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(errorCode), debugTextStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
         }
-        
-    private:
-        jobject javaCallbackRef;
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback : public Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>
+class CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback
+    : public Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>
 {
-    public:
-        CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(jobject javaCallback): Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(CallbackFn, this)
+public:
+    CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback(jobject javaCallback) :
+        Callback::Callback<OtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t action, uint32_t delayedActionTime)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t action, uint32_t delayedActionTime)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJ)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(action)
-                                , static_cast<jlong>(delayedActionTime)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJ)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(action), static_cast<jlong>(delayedActionTime));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback : public Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>
+class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
+    : public Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>
 {
-    public:
-        CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback): Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(CallbackFn, this)
+public:
+    CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback(jobject javaCallback) :
+        Callback::Callback<OtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4736,184 +5718,268 @@ class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback : public Ca
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, uint8_t * imageURI, uint32_t softwareVersion,
+                           uint8_t * softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded,
+                           chip::ByteSpan metadataForRequestor)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString imageURIStr(env, "");
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString softwareVersionStringStr(env, "");
+        jbyteArray updateTokenArr;
+        jbyteArray metadataForRequestorArr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess",
+                                                      "(IJLjava/lang/String;JLjava/lang/String;[BZ[B)V", &javaMethod);
+        SuccessOrExit(err);
+
+        updateTokenArr = env->NewByteArray(updateToken.size());
+        VerifyOrExit(updateTokenArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(updateTokenArr, 0, updateToken.size(), reinterpret_cast<const jbyte *>(updateToken.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        metadataForRequestorArr = env->NewByteArray(metadataForRequestor.size());
+        VerifyOrExit(metadataForRequestorArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(metadataForRequestorArr, 0, metadataForRequestor.size(),
+                                reinterpret_cast<const jbyte *>(metadataForRequestor.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jlong>(delayedActionTime),
+                            imageURIStr.jniValue(), static_cast<jlong>(softwareVersion), softwareVersionStringStr.jniValue(),
+                            updateTokenArr, static_cast<jboolean>(userConsentNeeded), metadataForRequestorArr);
+
+        env->DeleteLocalRef(updateTokenArr);
+        env->DeleteLocalRef(metadataForRequestorArr);
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterAttestationResponseCallback : public Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>
+class CHIPOperationalCredentialsClusterAttestationResponseCallback
+    : public Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>
 {
-    public:
-        CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>(CallbackFn, this)
+public:
+    CHIPOperationalCredentialsClusterAttestationResponseCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsClusterAttestationResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPOperationalCredentialsClusterAttestationResponseCallback()
+    }
+    ~CHIPOperationalCredentialsClusterAttestationResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOperationalCredentialsClusterAttestationResponseCallback * cppCallback = nullptr;
-            jbyteArray AttestationElementsArr;
-            jbyteArray SignatureArr;
+    static void CallbackFn(void * context, chip::ByteSpan AttestationElements, chip::ByteSpan Signature)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOperationalCredentialsClusterAttestationResponseCallback * cppCallback = nullptr;
+        jbyteArray AttestationElementsArr;
+        jbyteArray SignatureArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterAttestationResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            AttestationElementsArr = env->NewByteArray(AttestationElements.size());
-            VerifyOrExit(AttestationElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(AttestationElementsArr, 0, AttestationElements.size(), reinterpret_cast<const jbyte *>(AttestationElements.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-            SignatureArr = env->NewByteArray(Signature.size());
-            VerifyOrExit(SignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(SignatureArr, 0, Signature.size(), reinterpret_cast<const jbyte *>(Signature.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        AttestationElementsArr = env->NewByteArray(AttestationElements.size());
+        VerifyOrExit(AttestationElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(AttestationElementsArr, 0, AttestationElements.size(),
+                                reinterpret_cast<const jbyte *>(AttestationElements.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        SignatureArr = env->NewByteArray(Signature.size());
+        VerifyOrExit(SignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(SignatureArr, 0, Signature.size(), reinterpret_cast<const jbyte *>(Signature.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , AttestationElementsArr
-                , SignatureArr
-            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, AttestationElementsArr, SignatureArr);
 
-            env->DeleteLocalRef(AttestationElementsArr);
-            env->DeleteLocalRef(SignatureArr);
+        env->DeleteLocalRef(AttestationElementsArr);
+        env->DeleteLocalRef(SignatureArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterCertificateChainResponseCallback : public Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>
+class CHIPOperationalCredentialsClusterCertificateChainResponseCallback
+    : public Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>
 {
-    public:
-        CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>(CallbackFn, this)
+public:
+    CHIPOperationalCredentialsClusterCertificateChainResponseCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsClusterCertificateChainResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
+    }
+    ~CHIPOperationalCredentialsClusterCertificateChainResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, chip::ByteSpan Certificate)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOperationalCredentialsClusterCertificateChainResponseCallback * cppCallback = nullptr;
-            jbyteArray CertificateArr;
+    static void CallbackFn(void * context, chip::ByteSpan Certificate)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOperationalCredentialsClusterCertificateChainResponseCallback * cppCallback = nullptr;
+        jbyteArray CertificateArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterCertificateChainResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            CertificateArr = env->NewByteArray(Certificate.size());
-            VerifyOrExit(CertificateArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(CertificateArr, 0, Certificate.size(), reinterpret_cast<const jbyte *>(Certificate.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        CertificateArr = env->NewByteArray(Certificate.size());
+        VerifyOrExit(CertificateArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(CertificateArr, 0, Certificate.size(), reinterpret_cast<const jbyte *>(Certificate.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , CertificateArr
-            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, CertificateArr);
 
-            env->DeleteLocalRef(CertificateArr);
+        env->DeleteLocalRef(CertificateArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsClusterNOCResponseCallback : public Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>
+class CHIPOperationalCredentialsClusterNOCResponseCallback
+    : public Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>
 {
-    public:
-        CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>(CallbackFn, this)
+public:
+    CHIPOperationalCredentialsClusterNOCResponseCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsClusterNOCResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPOperationalCredentialsClusterNOCResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -4959,526 +6025,522 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback : public Callback::Ca
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPOperationalCredentialsClusterOpCSRResponseCallback : public Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>
-{
-    public:
-        CHIPOperationalCredentialsClusterOpCSRResponseCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>(CallbackFn, this)
+    }
+    ~CHIPOperationalCredentialsClusterNOCResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPOperationalCredentialsClusterOpCSRResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOperationalCredentialsClusterOpCSRResponseCallback * cppCallback = nullptr;
-            jbyteArray NOCSRElementsArr;
-            jbyteArray AttestationSignatureArr;
+    static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOperationalCredentialsClusterNOCResponseCallback * cppCallback = nullptr;
+        jbyteArray DebugTextArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterOpCSRResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II[B)V", &javaMethod);
+        SuccessOrExit(err);
 
-            NOCSRElementsArr = env->NewByteArray(NOCSRElements.size());
-            VerifyOrExit(NOCSRElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(NOCSRElementsArr, 0, NOCSRElements.size(), reinterpret_cast<const jbyte *>(NOCSRElements.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-            AttestationSignatureArr = env->NewByteArray(AttestationSignature.size());
-            VerifyOrExit(AttestationSignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(AttestationSignatureArr, 0, AttestationSignature.size(), reinterpret_cast<const jbyte *>(AttestationSignature.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        DebugTextArr = env->NewByteArray(DebugText.size());
+        VerifyOrExit(DebugTextArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(DebugTextArr, 0, DebugText.size(), reinterpret_cast<const jbyte *>(DebugText.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , NOCSRElementsArr
-                , AttestationSignatureArr
-            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(StatusCode), static_cast<jint>(FabricIndex),
+                            DebugTextArr);
 
-            env->DeleteLocalRef(NOCSRElementsArr);
-            env->DeleteLocalRef(AttestationSignatureArr);
+        env->DeleteLocalRef(DebugTextArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
+class CHIPOperationalCredentialsClusterOpCSRResponseCallback
+    : public Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>
 {
-    public:
-        CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
+public:
+    CHIPOperationalCredentialsClusterOpCSRResponseCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsClusterOpCSRResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
-        ~CHIPScenesClusterAddSceneResponseCallback()
+    }
+    ~CHIPOperationalCredentialsClusterOpCSRResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterAddSceneResponseCallback * cppCallback = nullptr;
+    static void CallbackFn(void * context, chip::ByteSpan NOCSRElements, chip::ByteSpan AttestationSignature)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPOperationalCredentialsClusterOpCSRResponseCallback * cppCallback = nullptr;
+        jbyteArray NOCSRElementsArr;
+        jbyteArray AttestationSignatureArr;
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+        cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterOpCSRResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-            SuccessOrExit(err);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "([B[B)V", &javaMethod);
+        SuccessOrExit(err);
 
+        NOCSRElementsArr = env->NewByteArray(NOCSRElements.size());
+        VerifyOrExit(NOCSRElementsArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(NOCSRElementsArr, 0, NOCSRElements.size(), reinterpret_cast<const jbyte *>(NOCSRElements.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+        AttestationSignatureArr = env->NewByteArray(AttestationSignature.size());
+        VerifyOrExit(AttestationSignatureArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(AttestationSignatureArr, 0, AttestationSignature.size(),
+                                reinterpret_cast<const jbyte *>(AttestationSignature.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneId)
-                            );
+        env->CallVoidMethod(javaCallbackRef, javaMethod, NOCSRElementsArr, AttestationSignatureArr);
 
+        env->DeleteLocalRef(NOCSRElementsArr);
+        env->DeleteLocalRef(AttestationSignatureArr);
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterGetSceneMembershipResponseCallback : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
+class CHIPScenesClusterAddSceneResponseCallback : public Callback::Callback<ScenesClusterAddSceneResponseCallback>
 {
-    public:
-        CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
+public:
+    CHIPScenesClusterAddSceneResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterAddSceneResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPScenesClusterGetSceneMembershipResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount, /* TYPE WARNING: array array defaults to */ uint8_t *  sceneList)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterGetSceneMembershipResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPScenesClusterAddSceneResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterAddSceneResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIII)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPScenesClusterAddSceneResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(capacity)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneCount)
-                                // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
+                            static_cast<jint>(sceneId));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterRemoveAllScenesResponseCallback : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
+class CHIPScenesClusterGetSceneMembershipResponseCallback
+    : public Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>
 {
-    public:
-        CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
+public:
+    CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterGetSceneMembershipResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPScenesClusterRemoveAllScenesResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterRemoveAllScenesResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPScenesClusterGetSceneMembershipResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status, uint8_t capacity, uint16_t groupId, uint8_t sceneCount,
+                           /* TYPE WARNING: array array defaults to */ uint8_t * sceneList)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterGetSceneMembershipResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPScenesClusterGetSceneMembershipResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIII)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(capacity),
+                            static_cast<jint>(groupId), static_cast<jint>(sceneCount)
+                            // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+        );
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
+class CHIPScenesClusterRemoveAllScenesResponseCallback : public Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>
 {
-    public:
-        CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
+public:
+    CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterRemoveAllScenesResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPScenesClusterRemoveSceneResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterRemoveSceneResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPScenesClusterRemoveAllScenesResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterRemoveAllScenesResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPScenesClusterRemoveAllScenesResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneId)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
+class CHIPScenesClusterRemoveSceneResponseCallback : public Callback::Callback<ScenesClusterRemoveSceneResponseCallback>
 {
-    public:
-        CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
+public:
+    CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterRemoveSceneResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPScenesClusterStoreSceneResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterStoreSceneResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPScenesClusterRemoveSceneResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterRemoveSceneResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPScenesClusterRemoveSceneResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneId)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
+                            static_cast<jint>(sceneId));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
+class CHIPScenesClusterStoreSceneResponseCallback : public Callback::Callback<ScenesClusterStoreSceneResponseCallback>
 {
-    public:
-        CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback): Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
+public:
+    CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterStoreSceneResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPScenesClusterViewSceneResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
-            UtfString sceneNameStr(env, sceneName);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPScenesClusterStoreSceneResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterStoreSceneResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPScenesClusterStoreSceneResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneId)
-                                , static_cast<jint>(transitionTime)
-                                , sceneNameStr.jniValue()
-                // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(III)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
+                            static_cast<jint>(sceneId));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callback<TvChannelClusterChangeChannelResponseCallback>
-{
-    public:
-        CHIPTvChannelClusterChangeChannelResponseCallback(jobject javaCallback): Callback::Callback<TvChannelClusterChangeChannelResponseCallback>(CallbackFn, this)
+        if (cppCallback != nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<ScenesClusterViewSceneResponseCallback>
+{
+public:
+    CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback) :
+        Callback::Callback<ScenesClusterViewSceneResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPTvChannelClusterChangeChannelResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -5487,32 +6549,37 @@ class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callb
             env->DeleteGlobalRef(javaCallbackRef);
         };
 
-        static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t *  ChannelMatch, uint8_t ErrorType)
+        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             jobject javaCallbackRef;
             jmethodID javaMethod;
-            CHIPTvChannelClusterChangeChannelResponseCallback * cppCallback = nullptr;
-
+            CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
+            UtfString sceneNameStr(env, sceneName);
+            
             VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            cppCallback = reinterpret_cast<CHIPTvChannelClusterChangeChannelResponseCallback *>(context);
+            cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
             VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
             javaCallbackRef = cppCallback->javaCallbackRef;
             VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
             SuccessOrExit(err);
 
 
             env->CallVoidMethod(javaCallbackRef, javaMethod
-                // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t * 
+                , static_cast<jint>(status)
+                                , static_cast<jint>(groupId)
+                                , static_cast<jint>(sceneId)
+                                , static_cast<jint>(transitionTime)
+                                , sceneNameStr.jniValue()
+                // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
                 // Conversion from this type to Java is not properly implemented yet
-                , static_cast<jint>(ErrorType)
-                            );
+            );
 
 
         exit:
@@ -5523,30 +6590,158 @@ class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callb
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPScenesClusterViewSceneResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
+                           uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString sceneNameStr(env, "");
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), static_cast<jint>(groupId),
+                            static_cast<jint>(sceneId), static_cast<jint>(transitionTime), sceneNameStr.jniValue()
+                            // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+        );
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPTargetNavigatorClusterNavigateTargetResponseCallback : public Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>
+class CHIPTvChannelClusterChangeChannelResponseCallback : public Callback::Callback<TvChannelClusterChangeChannelResponseCallback>
 {
-    public:
-        CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback): Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>(CallbackFn, this)
+public:
+    CHIPTvChannelClusterChangeChannelResponseCallback(jobject javaCallback) :
+        Callback::Callback<TvChannelClusterChangeChannelResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPTvChannelClusterChangeChannelResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t * ChannelMatch, uint8_t ErrorType)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTvChannelClusterChangeChannelResponseCallback * cppCallback = nullptr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPTvChannelClusterChangeChannelResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef,
+                            javaMethod
+                            // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+                            ,
+                            static_cast<jint>(ErrorType));
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
+    : public Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>
+{
+public:
+    CHIPTargetNavigatorClusterNavigateTargetResponseCallback(jobject javaCallback) :
+        Callback::Callback<TargetNavigatorClusterNavigateTargetResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
+<<<<<<< HEAD
             JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
             if (env == nullptr) {
                 ChipLogError(Zcl, "Could not create global reference for Java callback");
@@ -5591,76 +6786,129 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallback : public Callback
                 cppCallback->Cancel();
                 delete cppCallback;
             }
+=======
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-        
-    private:
+    }
+    ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, uint8_t * data)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
+        jmethodID javaMethod;
+        CHIPTargetNavigatorClusterNavigateTargetResponseCallback * cppCallback = nullptr;
+        // ByteSpan is not properly returned yet, temporarily use empty string
+        UtfString dataStr(env, "");
 
-class CHIPTestClusterClusterTestAddArgumentsResponseCallback : public Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>
-{
-    public:
-        CHIPTestClusterClusterTestAddArgumentsResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+        cppCallback = reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
+        SuccessOrExit(err);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), dataStr.jniValue());
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        ~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
+        if (cppCallback != nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
+};
 
-        static void CallbackFn(void * context, uint8_t returnValue)
+class CHIPTestClusterClusterTestAddArgumentsResponseCallback
+    : public Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>
+{
+public:
+    CHIPTestClusterClusterTestAddArgumentsResponseCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterClusterTestAddArgumentsResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPTestClusterClusterTestAddArgumentsResponseCallback * cppCallback = nullptr;
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
 
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPTestClusterClusterTestAddArgumentsResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t returnValue)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTestClusterClusterTestAddArgumentsResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestAddArgumentsResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(returnValue)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(returnValue));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 <<<<<<< HEAD
@@ -5875,89 +7123,92 @@ class CHIPTestClusterClusterTestNullableOptionalResponseCallback
 
 class CHIPTestClusterClusterTestSpecificResponseCallback : public Callback::Callback<TestClusterClusterTestSpecificResponseCallback>
 {
-    public:
-        CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestSpecificResponseCallback>(CallbackFn, this)
+public:
+    CHIPTestClusterClusterTestSpecificResponseCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterClusterTestSpecificResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPTestClusterClusterTestSpecificResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, uint8_t returnValue)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPTestClusterClusterTestSpecificResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPTestClusterClusterTestSpecificResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, uint8_t returnValue)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTestClusterClusterTestSpecificResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestSpecificResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(returnValue)
-                            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I)V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(returnValue));
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
-};
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
 
+private:
+    jobject javaCallbackRef;
+};
 
-class CHIPApplicationLauncherApplicationLauncherListAttributeCallback : public Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>
+class CHIPApplicationLauncherApplicationLauncherListAttributeCallback
+    : public Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>
 {
-    public:
-        CHIPApplicationLauncherApplicationLauncherListAttributeCallback(jobject javaCallback): Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPApplicationLauncherApplicationLauncherListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ApplicationLauncherApplicationLauncherListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint16_t> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6001,30 +7252,83 @@ class CHIPApplicationLauncherApplicationLauncherListAttributeCallback : public C
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, uint16_t * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPApplicationLauncherApplicationLauncherListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, applicationLauncherList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>
 {
-    public:
-        CHIPAudioOutputAudioOutputListAttributeCallback(jobject javaCallback): Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPAudioOutputAudioOutputListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<AudioOutputAudioOutputListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6061,34 +7365,102 @@ class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callbac
                 , "(IILjava/lang/String;)V");
             VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
 
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint index = entry.index;
-                                jint outputType = entry.outputType;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint index = entry.index;
+                                jint outputType = entry.outputType;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    index, 
+                    outputType, 
+                    name
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _AudioOutputInfo * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPAudioOutputAudioOutputListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    index, 
-                    outputType, 
-                    name
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl,
+                         "Could not find class chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
 
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint index      = entries[i].index;
+            jint outputType = entries[i].outputType;
+            jbyteArray name = env->NewByteArray(entries[i].name.size());
+            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
 
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, outputType, name);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
-            
-    private:
-        jobject javaCallbackRef;
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
+<<<<<<< HEAD
 class CHIPBridgedActionsActionListAttributeCallback : public Callback::Callback<BridgedActionsActionListListAttributeCallback>
 {
     public:
@@ -6263,23 +7635,28 @@ class CHIPBridgedActionsEndpointListAttributeCallback : public Callback::Callbac
 };
 
 class CHIPContentLauncherAcceptsHeaderListAttributeCallback : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
+=======
+class CHIPContentLauncherAcceptsHeaderListAttributeCallback
+    : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
+>>>>>>> b8d7ee0e3 (callback generation done)
 {
-    public:
-        CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback): Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ByteSpan> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6321,30 +7698,82 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback : public Callback::C
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jbyteArray acceptsHeaderList = env->NewByteArray(entries[i].size());
+            env->SetByteArrayRegion(acceptsHeaderList, 0, entries[i].size(), reinterpret_cast<const jbyte *>(entries[i].data()));
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherSupportedStreamingTypesAttributeCallback : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
+class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
+    : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
 {
-    public:
-        CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback): Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6388,30 +7817,83 @@ class CHIPContentLauncherSupportedStreamingTypesAttributeCallback : public Callb
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<DescriptorDeviceListListAttributeCallback>
 {
-    public:
-        CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorDeviceListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPDescriptorDeviceListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<DescriptorDeviceListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6467,30 +7949,95 @@ class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<Desc
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _DeviceType * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JI)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find DeviceListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jlong type    = entries[i].type;
+            jint revision = entries[i].revision;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, type, revision);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create DeviceListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<DescriptorServerListListAttributeCallback>
 {
-    public:
-        CHIPDescriptorServerListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorServerListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPDescriptorServerListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<DescriptorServerListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ClusterId> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6534,30 +8081,83 @@ class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<Desc
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPDescriptorServerListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
+            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
+            jobject serverList      = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, serverList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<DescriptorClientListListAttributeCallback>
 {
-    public:
-        CHIPDescriptorClientListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorClientListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPDescriptorClientListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<DescriptorClientListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ClusterId> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6601,30 +8201,83 @@ class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<Desc
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPDescriptorClientListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
+            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
+            jobject clientList      = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, clientList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<DescriptorPartsListListAttributeCallback>
 {
-    public:
-        CHIPDescriptorPartsListAttributeCallback(jobject javaCallback): Callback::Callback<DescriptorPartsListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPDescriptorPartsListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<DescriptorPartsListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::EndpointId> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6668,30 +8321,83 @@ class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<Descr
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, chip::EndpointId * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPDescriptorPartsListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject partsList       = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, partsList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<FixedLabelLabelListListAttributeCallback>
 {
-    public:
-        CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback): Callback::Callback<FixedLabelLabelListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPFixedLabelLabelListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<FixedLabelLabelListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6720,59 +8426,127 @@ class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<Fixed
             err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
             VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(Ljava/lang/String;Ljava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(Ljava/lang/String;Ljava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                UtfString labelStr(env, entry.label);
+                jstring label(labelStr.jniValue());
+                UtfString valueStr(env, entry.value);
+                jstring value(valueStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    label, 
+                    value
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _LabelStruct * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                UtfString labelStr(env, entry.label);
-                jstring label(labelStr.jniValue());
-                UtfString valueStr(env, entry.value);
-                jstring value(valueStr.jniValue());
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "([B[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
 
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    label, 
-                    value
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jbyteArray label = env->NewByteArray(entries[i].label.size());
+            env->SetByteArrayRegion(label, 0, entries[i].label.size(), reinterpret_cast<const jbyte *>(entries[i].label.data()));
+            jbyteArray value = env->NewByteArray(entries[i].value.size());
+            env->SetByteArrayRegion(value, 0, entries[i].value.size(), reinterpret_cast<const jbyte *>(entries[i].value.data()));
 
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, label, value);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
 
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
-            
-    private:
-        jobject javaCallbackRef;
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback : public Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>
+class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
+    : public Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>
 {
-    public:
-        CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback(jobject javaCallback): Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<GeneralCommissioningBasicCommissioningInfoListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6826,30 +8600,100 @@ class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback : publ
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _BasicCommissioningInfoType * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute",
+            attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl,
+                         "Could not find class "
+                         "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(J)V");
+        VerifyOrReturn(attributeCtor != nullptr,
+                       ChipLogError(Zcl, "Could not find BasicCommissioningInfoListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jlong failSafeExpiryLengthMs = entries[i].FailSafeExpiryLengthMs;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, failSafeExpiryLengthMs);
+            VerifyOrReturn(attributeObj != nullptr,
+                           ChipLogError(Zcl, "Could not create BasicCommissioningInfoListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback : public Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
+class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
+    : public Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>
 {
-    public:
-        CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback): Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback(jobject javaCallback) :
+        Callback::Callback<GeneralDiagnosticsNetworkInterfacesListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6915,30 +8759,106 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback : public Callback
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _NetworkInterfaceType * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl,
+                "Could not find class chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "([BZZZ[BI)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NetworkInterfacesAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jbyteArray name = env->NewByteArray(entries[i].Name.size());
+            env->SetByteArrayRegion(name, 0, entries[i].Name.size(), reinterpret_cast<const jbyte *>(entries[i].Name.data()));
+            jboolean fabricConnected                 = entries[i].FabricConnected;
+            jboolean offPremiseServicesReachableIPv4 = entries[i].OffPremiseServicesReachableIPv4;
+            jboolean offPremiseServicesReachableIPv6 = entries[i].OffPremiseServicesReachableIPv6;
+            jbyteArray hardwareAddress               = env->NewByteArray(entries[i].HardwareAddress.size());
+            env->SetByteArrayRegion(hardwareAddress, 0, entries[i].HardwareAddress.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].HardwareAddress.data()));
+            jint type = entries[i].Type;
+
+            jobject attributeObj =
+                env->NewObject(attributeClass, attributeCtor, name, fabricConnected, offPremiseServicesReachableIPv4,
+                               offPremiseServicesReachableIPv6, hardwareAddress, type);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NetworkInterfacesAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>
 {
-    public:
-        CHIPGroupKeyManagementGroupsAttributeCallback(jobject javaCallback): Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPGroupKeyManagementGroupsAttributeCallback(jobject javaCallback) :
+        Callback::Callback<GroupKeyManagementGroupsListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6975,51 +8895,117 @@ class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<
                 , "(III)V");
             VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
 
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint vendorId = entry.vendorId;
-                                jint vendorGroupId = entry.vendorGroupId;
-                                jint groupKeySetIndex = entry.groupKeySetIndex;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    vendorId, 
-                    vendorGroupId, 
-                    groupKeySetIndex
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint vendorId = entry.vendorId;
+                                jint vendorGroupId = entry.vendorGroupId;
+                                jint groupKeySetIndex = entry.groupKeySetIndex;
+                
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    vendorId, 
+                    vendorGroupId, 
+                    groupKeySetIndex
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _GroupState * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPGroupKeyManagementGroupsAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(III)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
 
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint vendorId         = entries[i].VendorId;
+            jint vendorGroupId    = entries[i].VendorGroupId;
+            jint groupKeySetIndex = entries[i].GroupKeySetIndex;
 
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, vendorGroupId, groupKeySetIndex);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
-            
-    private:
-        jobject javaCallbackRef;
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>
 {
-    public:
-        CHIPGroupKeyManagementGroupKeysAttributeCallback(jobject javaCallback): Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPGroupKeyManagementGroupKeysAttributeCallback(jobject javaCallback) :
+        Callback::Callback<GroupKeyManagementGroupKeysListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7082,30 +9068,102 @@ class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callba
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _GroupKey * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPGroupKeyManagementGroupKeysAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl,
+                         "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[BJI)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupKeysAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint vendorId           = entries[i].VendorId;
+            jint groupKeyIndex      = entries[i].GroupKeyIndex;
+            jbyteArray groupKeyRoot = env->NewByteArray(entries[i].GroupKeyRoot.size());
+            env->SetByteArrayRegion(groupKeyRoot, 0, entries[i].GroupKeyRoot.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].GroupKeyRoot.data()));
+            jlong groupKeyEpochStartTime = entries[i].GroupKeyEpochStartTime;
+            jint groupKeySecurityPolicy  = entries[i].GroupKeySecurityPolicy;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, groupKeyIndex, groupKeyRoot,
+                                                  groupKeyEpochStartTime, groupKeySecurityPolicy);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupKeysAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<MediaInputMediaInputListListAttributeCallback>
 {
-    public:
-        CHIPMediaInputMediaInputListAttributeCallback(jobject javaCallback): Callback::Callback<MediaInputMediaInputListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPMediaInputMediaInputListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<MediaInputMediaInputListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7167,30 +9225,101 @@ class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _MediaInputInfo * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPMediaInputMediaInputListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find MediaInputListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint index      = entries[i].index;
+            jint inputType  = entries[i].inputType;
+            jbyteArray name = env->NewByteArray(entries[i].name.size());
+            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
+            jbyteArray description = env->NewByteArray(entries[i].description.size());
+            env->SetByteArrayRegion(description, 0, entries[i].description.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].description.data()));
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, inputType, name, description);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create MediaInputListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPOperationalCredentialsFabricsListAttributeCallback : public Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>
+class CHIPOperationalCredentialsFabricsListAttributeCallback
+    : public Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>
 {
-    public:
-        CHIPOperationalCredentialsFabricsListAttributeCallback(jobject javaCallback): Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPOperationalCredentialsFabricsListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<OperationalCredentialsFabricsListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7227,41 +9356,115 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback : public Callback::
                 , "(I[BIJJLjava/lang/String;)V");
             VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
 
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint fabricIndex = entry.fabricIndex;
-                                jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
-                env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(), reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
-                jint vendorId = entry.vendorId;
-                                jlong fabricId = entry.fabricId;
-                                jlong nodeId = entry.nodeId;
-                                UtfString labelStr(env, entry.label);
-                jstring label(labelStr.jniValue());
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint fabricIndex = entry.fabricIndex;
+                                jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
+                env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(), reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
+                jint vendorId = entry.vendorId;
+                                jlong fabricId = entry.fabricId;
+                                jlong nodeId = entry.nodeId;
+                                UtfString labelStr(env, entry.label);
+                jstring label(labelStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    fabricIndex, 
+                    rootPublicKey, 
+                    vendorId, 
+                    fabricId, 
+                    nodeId, 
+                    label
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _FabricDescriptor * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPOperationalCredentialsFabricsListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl, "Could not find class chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[BIJJ[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
 
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    fabricIndex, 
-                    rootPublicKey, 
-                    vendorId, 
-                    fabricId, 
-                    nodeId, 
-                    label
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint fabricIndex         = entries[i].FabricIndex;
+            jbyteArray rootPublicKey = env->NewByteArray(entries[i].RootPublicKey.size());
+            env->SetByteArrayRegion(rootPublicKey, 0, entries[i].RootPublicKey.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].RootPublicKey.data()));
+            jint vendorId    = entries[i].VendorId;
+            jlong fabricId   = entries[i].FabricId;
+            jlong nodeId     = entries[i].NodeId;
+            jbyteArray label = env->NewByteArray(entries[i].Label.size());
+            env->SetByteArrayRegion(label, 0, entries[i].Label.size(), reinterpret_cast<const jbyte *>(entries[i].Label.data()));
 
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            jobject attributeObj =
+                env->NewObject(attributeClass, attributeCtor, fabricIndex, rootPublicKey, vendorId, fabricId, nodeId, label);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
 
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
-            
-    private:
-        jobject javaCallbackRef;
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
     : public Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
@@ -7341,23 +9544,28 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
 =======
 class CHIPPowerSourceActiveBatteryFaultsAttributeCallback : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
+    : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
+>>>>>>> 677ef48a5 (callback generation done)
 {
-    public:
-        CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback): Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback) :
+        Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint8_t> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7401,30 +9609,83 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback : public Callback::Cal
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor     = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeBatteryFaults);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<TvChannelTvChannelListListAttributeCallback>
 {
-    public:
-        CHIPTvChannelTvChannelListAttributeCallback(jobject javaCallback): Callback::Callback<TvChannelTvChannelListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPTvChannelTvChannelListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<TvChannelTvChannelListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7489,30 +9750,105 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _TvChannelInfo * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPTvChannelTvChannelListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B[B[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TvChannelListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint majorNumber = entries[i].majorNumber;
+            jint minorNumber = entries[i].minorNumber;
+            jbyteArray name  = env->NewByteArray(entries[i].name.size());
+            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
+            jbyteArray callSign = env->NewByteArray(entries[i].callSign.size());
+            env->SetByteArrayRegion(callSign, 0, entries[i].callSign.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].callSign.data()));
+            jbyteArray affiliateCallSign = env->NewByteArray(entries[i].affiliateCallSign.size());
+            env->SetByteArrayRegion(affiliateCallSign, 0, entries[i].affiliateCallSign.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].affiliateCallSign.data()));
+
+            jobject attributeObj =
+                env->NewObject(attributeClass, attributeCtor, majorNumber, minorNumber, name, callSign, affiliateCallSign);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TvChannelListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPTargetNavigatorTargetNavigatorListAttributeCallback : public Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>
+class CHIPTargetNavigatorTargetNavigatorListAttributeCallback
+    : public Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>
 {
-    public:
-        CHIPTargetNavigatorTargetNavigatorListAttributeCallback(jobject javaCallback): Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPTargetNavigatorTargetNavigatorListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<TargetNavigatorTargetNavigatorListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7541,58 +9877,126 @@ class CHIPTargetNavigatorTargetNavigatorListAttributeCallback : public Callback:
             err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
             VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(ILjava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
+            jclass attributeClass;
+            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
+            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
+            JniClass attributeJniClass(attributeClass);
+            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
+                , "(ILjava/lang/String;)V");
+            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
+
+            auto iter = list.begin();
+            while (iter.Next())
+            {
+                auto & entry = iter.GetValue();
+                jint identifier = entry.identifier;
+                                UtfString nameStr(env, entry.name);
+                jstring name(nameStr.jniValue());
+
+                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
+                    identifier, 
+                    name
+                );
+                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
+
+                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+            }
+            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+            env->ExceptionClear();
+            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
+        }
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _NavigateTargetTargetInfo * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPTargetNavigatorTargetNavigatorListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint identifier = entry.identifier;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl,
+                "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
 
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    identifier, 
-                    name
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint identifier = entries[i].identifier;
+            jbyteArray name = env->NewByteArray(entries[i].name.size());
+            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
 
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, identifier, name);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
 
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
-            
-    private:
-        jobject javaCallbackRef;
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<TestClusterListInt8uListAttributeCallback>
 {
-    public:
-        CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListInt8uListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPTestClusterListInt8uAttributeCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterListInt8uListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint8_t> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7636,30 +10040,83 @@ class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<Test
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject listInt8u       = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listInt8u);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callback<TestClusterListOctetStringListAttributeCallback>
 {
-    public:
-        CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListOctetStringListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPTestClusterListOctetStringAttributeCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterListOctetStringListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ByteSpan> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7701,30 +10158,82 @@ class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callbac
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jbyteArray listOctetString = env->NewByteArray(entries[i].size());
+            env->SetByteArrayRegion(listOctetString, 0, entries[i].size(), reinterpret_cast<const jbyte *>(entries[i].data()));
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listOctetString);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPTestClusterListStructOctetStringAttributeCallback : public Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>
+class CHIPTestClusterListStructOctetStringAttributeCallback
+    : public Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>
 {
-    public:
-        CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback): Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPTestClusterListStructOctetStringAttributeCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterListStructOctetStringListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7781,30 +10290,99 @@ class CHIPTestClusterListStructOctetStringAttributeCallback : public Callback::C
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _TestListStructOctet * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
 
-class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
-{
-    public:
-        CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(CallbackFn, this)
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl, "Could not find class chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(J[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ListStructOctetStringAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+            jlong fabricIndex          = entries[i].fabricIndex;
+            jbyteArray operationalCert = env->NewByteArray(entries[i].operationalCert.size());
+            env->SetByteArrayRegion(operationalCert, 0, entries[i].operationalCert.size(),
+                                    reinterpret_cast<const jbyte *>(entries[i].operationalCert.data()));
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, fabricIndex, operationalCert);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ListStructOctetStringAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
+    : public Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>
+{
+public:
+    CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ThreadNetworkDiagnosticsNeighborTableListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7884,30 +10462,112 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback : public Ca
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _NeighborTable * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl,
+                         "Could not find class "
+                         "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JJIJJIIIIIZZZZ)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NeighborTableListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jlong extAddress          = entries[i].ExtAddress;
+            jlong age                 = entries[i].Age;
+            jint rloc16               = entries[i].Rloc16;
+            jlong linkFrameCounter    = entries[i].LinkFrameCounter;
+            jlong mleFrameCounter     = entries[i].MleFrameCounter;
+            jint lqi                  = entries[i].LQI;
+            jint averageRssi          = entries[i].AverageRssi;
+            jint lastRssi             = entries[i].LastRssi;
+            jint frameErrorRate       = entries[i].FrameErrorRate;
+            jint messageErrorRate     = entries[i].MessageErrorRate;
+            jboolean rxOnWhenIdle     = entries[i].RxOnWhenIdle;
+            jboolean fullThreadDevice = entries[i].FullThreadDevice;
+            jboolean fullNetworkData  = entries[i].FullNetworkData;
+            jboolean isChild          = entries[i].IsChild;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, age, rloc16, linkFrameCounter,
+                                                  mleFrameCounter, lqi, averageRssi, lastRssi, frameErrorRate, messageErrorRate,
+                                                  rxOnWhenIdle, fullThreadDevice, fullNetworkData, isChild);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NeighborTableListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
+    : public Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>
 {
-    public:
-        CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ThreadNetworkDiagnosticsRouteTableListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7979,30 +10639,107 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback : public Callb
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _RouteTable * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl,
+                "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JIIIIIIIZZ)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find RouteTableListAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jlong extAddress         = entries[i].ExtAddress;
+            jint rloc16              = entries[i].Rloc16;
+            jint routerId            = entries[i].RouterId;
+            jint nextHop             = entries[i].NextHop;
+            jint pathCost            = entries[i].PathCost;
+            jint LQIIn               = entries[i].LQIIn;
+            jint LQIOut              = entries[i].LQIOut;
+            jint age                 = entries[i].Age;
+            jboolean allocated       = entries[i].Allocated;
+            jboolean linkEstablished = entries[i].LinkEstablished;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, rloc16, routerId, nextHop, pathCost,
+                                                  LQIIn, LQIOut, age, allocated, linkEstablished);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create RouteTableListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
+    : public Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>
 {
-    public:
-        CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ThreadNetworkDiagnosticsSecurityPolicyListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8058,30 +10795,98 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback : public Callb
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _SecurityPolicy * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl,
+                "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find SecurityPolicyAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jint rotationTime = entries[i].RotationTime;
+            jint flags        = entries[i].Flags;
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, rotationTime, flags);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create SecurityPolicyAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
-class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>
+class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
+    : public Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>
 {
-    public:
-        CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>(CallbackFn, this)
+public:
+    CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ThreadNetworkDiagnosticsOperationalDatasetComponentsListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8157,30 +10962,115 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, _OperationalDatasetComponents * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
 
-class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback : public Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
-{
-    public:
-        CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback): Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute",
+            attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(
+                Zcl,
+                "Could not find class "
+                "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ZZZZZZZZZZZZ)V");
+        VerifyOrReturn(attributeCtor != nullptr,
+                       ChipLogError(Zcl, "Could not find OperationalDatasetComponentsAttribute constructor"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jboolean activeTimestampPresent  = entries[i].ActiveTimestampPresent;
+            jboolean pendingTimestampPresent = entries[i].PendingTimestampPresent;
+            jboolean masterKeyPresent        = entries[i].MasterKeyPresent;
+            jboolean networkNamePresent      = entries[i].NetworkNamePresent;
+            jboolean extendedPanIdPresent    = entries[i].ExtendedPanIdPresent;
+            jboolean meshLocalPrefixPresent  = entries[i].MeshLocalPrefixPresent;
+            jboolean delayPresent            = entries[i].DelayPresent;
+            jboolean panIdPresent            = entries[i].PanIdPresent;
+            jboolean channelPresent          = entries[i].ChannelPresent;
+            jboolean pskcPresent             = entries[i].PskcPresent;
+            jboolean securityPolicyPresent   = entries[i].SecurityPolicyPresent;
+            jboolean channelMaskPresent      = entries[i].ChannelMaskPresent;
+
+            jobject attributeObj =
+                env->NewObject(attributeClass, attributeCtor, activeTimestampPresent, pendingTimestampPresent, masterKeyPresent,
+                               networkNamePresent, extendedPanIdPresent, meshLocalPrefixPresent, delayPresent, panIdPresent,
+                               channelPresent, pskcPresent, securityPolicyPresent, channelMaskPresent);
+            VerifyOrReturn(attributeObj != nullptr,
+                           ChipLogError(Zcl, "Could not create OperationalDatasetComponentsAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
 
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
+    : public Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>
+{
+public:
+    CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ThreadNetworkDiagnosticsActiveNetworkFaultsListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
 
+<<<<<<< HEAD
         static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
+=======
+<<<<<<< HEAD
+        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
+>>>>>>> b8d7ee0e3 (callback generation done)
         {
             chip::DeviceLayer::StackUnlock unlock;
             CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8224,18 +11114,70 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback : pub
 
             env->ExceptionClear();
             env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+=======
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+>>>>>>> e993d01f0 (callback generation done)
         }
-            
-    private:
+    }
+
+    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
-};
 
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        for (uint16_t i = 0; i < count; i++)
+        {
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeNetworkFaultsList);
+        }
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
+};
 
 JNI_METHOD(void, BaseChipCluster, deleteCluster)(JNIEnv * env, jobject self, jlong clusterPtr)
 {
     chip::DeviceLayer::StackLock lock;
     ClusterBase * cluster = reinterpret_cast<ClusterBase *>(clusterPtr);
-    if (cluster != nullptr) {
+    if (cluster != nullptr)
+    {
         delete cluster;
     }
 }
@@ -8249,86 +11191,115 @@ JNI_METHOD(jlong, AccountLoginCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AccountLoginCluster, getSetupPIN)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier)
+JNI_METHOD(void, AccountLoginCluster, getSetupPIN)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
-    
+
     JniUtfString tempAccountIdentifierStr(env, tempAccountIdentifier);
-    
-    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback, void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)> onSuccess(
-        Platform::New<CHIPAccountLoginClusterGetSetupPINResponseCallback>(callback), Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPAccountLoginClusterGetSetupPINResponseCallback,
+                    void (*)(CHIPAccountLoginClusterGetSetupPINResponseCallback *)>
+        onSuccess(Platform::New<CHIPAccountLoginClusterGetSetupPINResponseCallback>(callback),
+                  Platform::Delete<CHIPAccountLoginClusterGetSetupPINResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())));
+=======
+    err =
+        cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(),
+                                chip::ByteSpan((const uint8_t *) tempAccountIdentifier, strlen(tempAccountIdentifierStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AccountLoginCluster, login)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN)
+JNI_METHOD(void, AccountLoginCluster, login)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring tempAccountIdentifier, jstring setupPIN)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster;
-    
+
     JniUtfString tempAccountIdentifierStr(env, tempAccountIdentifier);
-        JniUtfString setupPINStr(env, setupPIN);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    JniUtfString setupPINStr(env, setupPIN);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())), chip::CharSpan(setupPINStr.c_str(), strlen(setupPINStr.c_str())));
+=======
+    err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(),
+                            chip::ByteSpan((const uint8_t *) tempAccountIdentifier, strlen(tempAccountIdentifierStr.c_str())),
+                            chip::ByteSpan((const uint8_t *) setupPIN, strlen(setupPINStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -8337,15 +11308,20 @@ JNI_METHOD(void, AccountLoginCluster, login)(JNIEnv * env, jobject self, jlong c
 JNI_METHOD(void, AccountLoginCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     AccountLoginCluster * cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8362,15 +11338,17 @@ JNI_METHOD(jlong, AdministratorCommissioningCluster, initWithDevice)(JNIEnv * en
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout)
+JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8380,79 +11358,98 @@ JNI_METHOD(void, AdministratorCommissioningCluster, openBasicCommissioningWindow
     err = cppCluster->OpenBasicCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout, jbyteArray PAKEVerifier, jint discriminator, jlong iterations, jbyteArray salt, jint passcodeID)
+JNI_METHOD(void, AdministratorCommissioningCluster, openCommissioningWindow)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint commissioningTimeout, jbyteArray PAKEVerifier,
+ jint discriminator, jlong iterations, jbyteArray salt, jint passcodeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
-    
+
     JniByteArray PAKEVerifierArr(env, PAKEVerifier);
     JniByteArray saltArr(env, salt);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AdministratorCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->OpenCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout, chip::ByteSpan((const uint8_t*) PAKEVerifierArr.data(), PAKEVerifierArr.size()), discriminator, iterations, chip::ByteSpan((const uint8_t*) saltArr.data(), saltArr.size()), passcodeID);
+    err = cppCluster->OpenCommissioningWindow(onSuccess->Cancel(), onFailure->Cancel(), commissioningTimeout,
+                                              chip::ByteSpan((const uint8_t *) PAKEVerifierArr.data(), PAKEVerifierArr.size()),
+                                              discriminator, iterations,
+                                              chip::ByteSpan((const uint8_t *) saltArr.data(), saltArr.size()), passcodeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8462,41 +11459,52 @@ JNI_METHOD(void, AdministratorCommissioningCluster, revokeCommissioning)(JNIEnv
     err = cppCluster->RevokeCommissioning(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AdministratorCommissioningCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     AdministratorCommissioningCluster * cppCluster = reinterpret_cast<AdministratorCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8518,10 +11526,11 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8531,24 +11540,29 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
     err = cppCluster->ChangeStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(status));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -8557,16 +11571,20 @@ JNI_METHOD(void, ApplicationBasicCluster, changeStatus)(JNIEnv * env, jobject se
 JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8578,15 +11596,20 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorNameAttribute)(JNIEnv * env,
 JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8595,19 +11618,24 @@ JNI_METHOD(void, ApplicationBasicCluster, readVendorIdAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8619,15 +11647,20 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationNameAttribute)(JNIEnv *
 JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8636,19 +11669,24 @@ JNI_METHOD(void, ApplicationBasicCluster, readProductIdAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8657,18 +11695,24 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationIdAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCatalogVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8677,18 +11721,24 @@ JNI_METHOD(void, ApplicationBasicCluster, readCatalogVendorIdAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8697,18 +11747,24 @@ JNI_METHOD(void, ApplicationBasicCluster, readApplicationStatusAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationBasicCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     ApplicationBasicCluster * cppCluster = reinterpret_cast<ApplicationBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8725,63 +11781,85 @@ JNI_METHOD(jlong, ApplicationLauncherCluster, initWithDevice)(JNIEnv * env, jobj
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, launchApp)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jint catalogVendorId, jstring applicationId)
+JNI_METHOD(void, ApplicationLauncherCluster, launchApp)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring data, jint catalogVendorId, jstring applicationId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster;
-    
+
     JniUtfString dataStr(env, data);
-        JniUtfString applicationIdStr(env, applicationId);
-    
-    std::unique_ptr<CHIPApplicationLauncherClusterLaunchAppResponseCallback, void (*)(CHIPApplicationLauncherClusterLaunchAppResponseCallback *)> onSuccess(
-        Platform::New<CHIPApplicationLauncherClusterLaunchAppResponseCallback>(callback), Platform::Delete<CHIPApplicationLauncherClusterLaunchAppResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    JniUtfString applicationIdStr(env, applicationId);
+
+    std::unique_ptr<CHIPApplicationLauncherClusterLaunchAppResponseCallback,
+                    void (*)(CHIPApplicationLauncherClusterLaunchAppResponseCallback *)>
+        onSuccess(Platform::New<CHIPApplicationLauncherClusterLaunchAppResponseCallback>(callback),
+                  Platform::Delete<CHIPApplicationLauncherClusterLaunchAppResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())), catalogVendorId, chip::CharSpan(applicationIdStr.c_str(), strlen(applicationIdStr.c_str())));
+=======
+    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(),
+                                chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())), catalogVendorId,
+                                chip::ByteSpan((const uint8_t *) applicationId, strlen(applicationIdStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback, void (*)(CHIPApplicationLauncherApplicationLauncherListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>(callback), Platform::Delete<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback,
+                    void (*)(CHIPApplicationLauncherApplicationLauncherListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>(callback),
+                  Platform::Delete<CHIPApplicationLauncherApplicationLauncherListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationLauncherList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8790,18 +11868,24 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationLauncherListAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCatalogVendorId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8810,18 +11894,24 @@ JNI_METHOD(void, ApplicationLauncherCluster, readCatalogVendorIdAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeApplicationId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8830,18 +11920,24 @@ JNI_METHOD(void, ApplicationLauncherCluster, readApplicationIdAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ApplicationLauncherCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     ApplicationLauncherCluster * cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8858,43 +11954,56 @@ JNI_METHOD(jlong, AudioOutputCluster, initWithDevice)(JNIEnv * env, jobject self
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, AudioOutputCluster, renameOutput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
+JNI_METHOD(void, AudioOutputCluster, renameOutput)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
-    
+
     JniUtfString nameStr(env, name);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
+=======
+    err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index,
+                                   chip::ByteSpan((const uint8_t *) name, strlen(nameStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -8904,10 +12013,11 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -8917,24 +12027,29 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
     err = cppCluster->SelectOutput(onSuccess->Cancel(), onFailure->Cancel(), index);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -8943,16 +12058,21 @@ JNI_METHOD(void, AudioOutputCluster, selectOutput)(JNIEnv * env, jobject self, j
 JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback, void (*)(CHIPAudioOutputAudioOutputListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPAudioOutputAudioOutputListAttributeCallback>(callback), Platform::Delete<CHIPAudioOutputAudioOutputListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback, void (*)(CHIPAudioOutputAudioOutputListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPAudioOutputAudioOutputListAttributeCallback>(callback),
+                  Platform::Delete<CHIPAudioOutputAudioOutputListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAudioOutputList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8961,18 +12081,24 @@ JNI_METHOD(void, AudioOutputCluster, readAudioOutputListAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentAudioOutput(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -8984,15 +12110,20 @@ JNI_METHOD(void, AudioOutputCluster, readCurrentAudioOutputAttribute)(JNIEnv * e
 JNI_METHOD(void, AudioOutputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     AudioOutputCluster * cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9009,15 +12140,17 @@ JNI_METHOD(jlong, BarrierControlCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint percentOpen)
+JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint percentOpen)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9027,24 +12160,29 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlGoToPercent)(JNIEnv * env,
     err = cppCluster->BarrierControlGoToPercent(onSuccess->Cancel(), onFailure->Cancel(), percentOpen);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -9054,10 +12192,11 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobjec
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9067,41 +12206,52 @@ JNI_METHOD(void, BarrierControlCluster, barrierControlStop)(JNIEnv * env, jobjec
     err = cppCluster->BarrierControlStop(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierMovingState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9110,18 +12260,24 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierMovingStateAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierSafetyStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9130,18 +12286,24 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierSafetyStatusAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierCapabilities(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9150,18 +12312,24 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierCapabilitiesAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBarrierPosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9170,18 +12338,24 @@ JNI_METHOD(void, BarrierControlCluster, readBarrierPositionAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BarrierControlCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BarrierControlCluster * cppCluster = reinterpret_cast<BarrierControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9203,10 +12377,11 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BasicCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9216,24 +12391,29 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
     err = cppCluster->MfgSpecificPing(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -9242,15 +12422,20 @@ JNI_METHOD(void, BasicCluster, mfgSpecificPing)(JNIEnv * env, jobject self, jlon
 JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInteractionModelVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9262,16 +12447,20 @@ JNI_METHOD(void, BasicCluster, readInteractionModelVersionAttribute)(JNIEnv * en
 JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9283,15 +12472,20 @@ JNI_METHOD(void, BasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9303,16 +12497,20 @@ JNI_METHOD(void, BasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self
 JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9324,15 +12522,20 @@ JNI_METHOD(void, BasicCluster, readProductNameAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9344,16 +12547,20 @@ JNI_METHOD(void, BasicCluster, readProductIDAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9362,21 +12569,32 @@ JNI_METHOD(void, BasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject sel
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
+<<<<<<< HEAD
     err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+=======
+    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
+                                              chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -9386,16 +12604,20 @@ JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9404,21 +12626,32 @@ JNI_METHOD(void, BasicCluster, readLocationAttribute)(JNIEnv * env, jobject self
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BasicCluster, writeLocationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
+<<<<<<< HEAD
     err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+=======
+    err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(),
+                                             chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -9428,15 +12661,20 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9448,16 +12686,20 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9469,15 +12711,20 @@ JNI_METHOD(void, BasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9489,16 +12736,20 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9510,16 +12761,20 @@ JNI_METHOD(void, BasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeManufacturingDate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9531,16 +12786,20 @@ JNI_METHOD(void, BasicCluster, readManufacturingDateAttribute)(JNIEnv * env, job
 JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9552,16 +12811,20 @@ JNI_METHOD(void, BasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductURL(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9573,16 +12836,20 @@ JNI_METHOD(void, BasicCluster, readProductURLAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9594,16 +12861,20 @@ JNI_METHOD(void, BasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSerialNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9615,15 +12886,20 @@ JNI_METHOD(void, BasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocalConfigDisabled(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9632,21 +12908,27 @@ JNI_METHOD(void, BasicCluster, readLocalConfigDisabledAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeLocalConfigDisabled(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -9655,15 +12937,20 @@ JNI_METHOD(void, BasicCluster, writeLocalConfigDisabledAttribute)(JNIEnv * env,
 JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeReachable(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9675,15 +12962,20 @@ JNI_METHOD(void, BasicCluster, readReachableAttribute)(JNIEnv * env, jobject sel
 JNI_METHOD(void, BasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     BasicCluster * cppCluster = reinterpret_cast<BasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9700,19 +12992,23 @@ JNI_METHOD(jlong, BinaryInputBasicCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOutOfService(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9721,21 +13017,27 @@ JNI_METHOD(void, BinaryInputBasicCluster, readOutOfServiceAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOutOfService(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -9744,15 +13046,20 @@ JNI_METHOD(void, BinaryInputBasicCluster, writeOutOfServiceAttribute)(JNIEnv * e
 JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9761,58 +13068,76 @@ JNI_METHOD(void, BinaryInputBasicCluster, readPresentValueAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, BinaryInputBasicCluster, writePresentValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, subscribePresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BinaryInputBasicCluster, subscribePresentValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributePresentValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                     static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
+        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributePresentValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -9820,15 +13145,20 @@ JNI_METHOD(void, BinaryInputBasicCluster, reportPresentValueAttribute)(JNIEnv *
 JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9837,54 +13167,72 @@ JNI_METHOD(void, BinaryInputBasicCluster, readStatusFlagsAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, subscribeStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BinaryInputBasicCluster, subscribeStatusFlagsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeStatusFlags(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                    static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, reportStatusFlagsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, reportStatusFlagsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeStatusFlags(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BinaryInputBasicCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     BinaryInputBasicCluster * cppCluster = reinterpret_cast<BinaryInputBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -9901,15 +13249,17 @@ JNI_METHOD(jlong, BindingCluster, initWithDevice)(JNIEnv * env, jobject self, jl
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BindingCluster, bind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
+JNI_METHOD(void, BindingCluster, bind)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9919,37 +13269,44 @@ JNI_METHOD(void, BindingCluster, bind)(JNIEnv * env, jobject self, jlong cluster
     err = cppCluster->Bind(onSuccess->Cancel(), onFailure->Cancel(), nodeId, groupId, endpointId, clusterId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BindingCluster, unbind)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
+JNI_METHOD(void, BindingCluster, unbind)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong nodeId, jint groupId, jint endpointId, jlong clusterId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BindingCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -9959,24 +13316,29 @@ JNI_METHOD(void, BindingCluster, unbind)(JNIEnv * env, jobject self, jlong clust
     err = cppCluster->Unbind(onSuccess->Cancel(), onFailure->Cancel(), nodeId, groupId, endpointId, clusterId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -9985,15 +13347,20 @@ JNI_METHOD(void, BindingCluster, unbind)(JNIEnv * env, jobject self, jlong clust
 JNI_METHOD(void, BindingCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err              = CHIP_NO_ERROR;
     BindingCluster * cppCluster = reinterpret_cast<BindingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10667,20 +14034,23 @@ JNI_METHOD(jlong, BridgedDeviceBasicCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10692,15 +14062,20 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorNameAttribute)(JNIEnv * en
 JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeVendorID(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10709,19 +14084,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readVendorIDAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10733,16 +14113,20 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductNameAttribute)(JNIEnv * e
 JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10751,39 +14135,56 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readUserLabelAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
+<<<<<<< HEAD
     err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+=======
+    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
+                                              chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10792,19 +14193,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeHardwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10813,18 +14219,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readHardwareVersionStringAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10833,19 +14245,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSoftwareVersionString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10854,19 +14271,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSoftwareVersionStringAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeManufacturingDate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10878,16 +14300,20 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readManufacturingDateAttribute)(JNIE
 JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10899,16 +14325,20 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readPartNumberAttribute)(JNIEnv * en
 JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductURL(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10917,19 +14347,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductURLAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeProductLabel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10938,19 +14373,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readProductLabelAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSerialNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10962,15 +14402,20 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readSerialNumberAttribute)(JNIEnv *
 JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeReachable(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -10979,18 +14424,24 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, readReachableAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedDeviceBasicCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     BridgedDeviceBasicCluster * cppCluster = reinterpret_cast<BridgedDeviceBasicCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11007,60 +14458,75 @@ JNI_METHOD(jlong, ColorControlCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ColorControlCluster, colorLoopSet)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint updateFlags, jint action, jint direction, jint time, jint startHue, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, colorLoopSet)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint updateFlags, jint action, jint direction, jint time,
+ jint startHue, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
-
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, static_cast<uint8_t>(action),
                                    static_cast<uint8_t>(direction), time, startHue, optionsMask, optionsOverride);
 =======
     err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, action, direction, time, startHue, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, action, direction, time, startHue,
+                                   optionsMask, optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11071,167 +14537,209 @@ JNI_METHOD(void, ColorControlCluster, enhancedMoveHue)(JNIEnv * env, jobject sel
                                       optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint direction, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint direction, jint transitionTime,
+ jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, static_cast<uint8_t>(direction),
                                         transitionTime, optionsMask, optionsOverride);
 =======
     err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, direction, transitionTime, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, direction, transitionTime,
+                                        optionsMask, optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedMoveToHueAndSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedMoveToHueAndSaturation)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint enhancedHue, jint saturation, jint transitionTime,
+ jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->EnhancedMoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, saturation, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->EnhancedMoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, saturation,
+                                                     transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, enhancedStepHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, enhancedStepHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
+ jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                       transitionTime, optionsMask, optionsOverride);
 =======
     err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
+                                      optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint rateX, jint rateY, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveColor)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint rateX, jint rateY, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11241,82 +14749,102 @@ JNI_METHOD(void, ColorControlCluster, moveColor)(JNIEnv * env, jobject self, jlo
     err = cppCluster->MoveColor(onSuccess->Cancel(), onFailure->Cancel(), rateX, rateY, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveColorTemperature)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint colorTemperatureMinimum,
+ jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(moveMode), rate,
                                            colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
 =======
     err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum,
+                                           colorTemperatureMaximum, optionsMask, optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11327,37 +14855,44 @@ JNI_METHOD(void, ColorControlCluster, moveHue)(JNIEnv * env, jobject self, jlong
                               optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveSaturation)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11368,288 +14903,355 @@ JNI_METHOD(void, ColorControlCluster, moveSaturation)(JNIEnv * env, jobject self
                                      optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorX, jint colorY, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToColor)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorX, jint colorY, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->MoveToColor(onSuccess->Cancel(), onFailure->Cancel(), colorX, colorY, transitionTime, optionsMask,
+                                  optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorTemperature, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToColorTemperature)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint colorTemperature, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->MoveToColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), colorTemperature, transitionTime,
+                                             optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint direction, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint direction, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, static_cast<uint8_t>(direction), transitionTime,
                                 optionsMask, optionsOverride);
 =======
     err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask,
+                                optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToHueAndSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToHueAndSaturation)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint hue, jint saturation, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->MoveToHueAndSaturation(onSuccess->Cancel(), onFailure->Cancel(), hue, saturation, transitionTime, optionsMask,
+                                             optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, moveToSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint saturation, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, moveToSaturation)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint saturation, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask, optionsOverride);
+    err = cppCluster->MoveToSaturation(onSuccess->Cancel(), onFailure->Cancel(), saturation, transitionTime, optionsMask,
+                                       optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepColor)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepX, jint stepY, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepColor)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepX, jint stepY, jint transitionTime, jint optionsMask,
+ jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
+    err =
+        cppCluster->StepColor(onSuccess->Cancel(), onFailure->Cancel(), stepX, stepY, transitionTime, optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepColorTemperature)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepColorTemperature)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
+ jint colorTemperatureMinimum, jint colorTemperatureMaximum, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                            transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,
@@ -11657,129 +15259,166 @@ JNI_METHOD(void, ColorControlCluster, stepColorTemperature)(JNIEnv * env, jobjec
 =======
     err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime,
+                                           colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepHue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepHue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
+ jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                               optionsMask, optionsOverride);
 =======
     err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
+                              optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stepSaturation)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stepSaturation)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime,
+ jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                      transitionTime, optionsMask, optionsOverride);
 =======
     err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
+                                     optionsOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ColorControlCluster, stopMoveStep)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionsMask, jint optionsOverride)
+JNI_METHOD(void, ColorControlCluster, stopMoveStep)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionsMask, jint optionsOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -11789,24 +15428,29 @@ JNI_METHOD(void, ColorControlCluster, stopMoveStep)(JNIEnv * env, jobject self,
     err = cppCluster->StopMoveStep(onSuccess->Cancel(), onFailure->Cancel(), optionsMask, optionsOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -11815,15 +15459,20 @@ JNI_METHOD(void, ColorControlCluster, stopMoveStep)(JNIEnv * env, jobject self,
 JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11832,20 +15481,27 @@ JNI_METHOD(void, ColorControlCluster, readCurrentHueAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                   static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -11855,31 +15511,41 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentHueAttribute)(JNIEnv * env
 JNI_METHOD(void, ColorControlCluster, reportCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentHue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11888,38 +15554,50 @@ JNI_METHOD(void, ColorControlCluster, readCurrentSaturationAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentSaturationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentSaturation(onSuccess->Cancel(), onFailure->Cancel(),
+                                                          static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentSaturation(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -11927,15 +15605,20 @@ JNI_METHOD(void, ColorControlCluster, reportCurrentSaturationAttribute)(JNIEnv *
 JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRemainingTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11947,15 +15630,20 @@ JNI_METHOD(void, ColorControlCluster, readRemainingTimeAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -11964,20 +15652,27 @@ JNI_METHOD(void, ColorControlCluster, readCurrentXAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                 static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -11987,15 +15682,19 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentXAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, reportCurrentXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentX(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -12003,15 +15702,20 @@ JNI_METHOD(void, ColorControlCluster, reportCurrentXAttribute)(JNIEnv * env, job
 JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12020,20 +15724,27 @@ JNI_METHOD(void, ColorControlCluster, readCurrentYAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                 static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -12043,31 +15754,41 @@ JNI_METHOD(void, ColorControlCluster, subscribeCurrentYAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, reportCurrentYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentY(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDriftCompensation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12079,16 +15800,20 @@ JNI_METHOD(void, ColorControlCluster, readDriftCompensationAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCompensationText(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12100,15 +15825,20 @@ JNI_METHOD(void, ColorControlCluster, readCompensationTextAttribute)(JNIEnv * en
 JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12117,38 +15847,50 @@ JNI_METHOD(void, ColorControlCluster, readColorTemperatureAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, subscribeColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ColorControlCluster, subscribeColorTemperatureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeColorTemperature(onSuccess->Cancel(), onFailure->Cancel(),
+                                                         static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeColorTemperature(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -12156,15 +15898,20 @@ JNI_METHOD(void, ColorControlCluster, reportColorTemperatureAttribute)(JNIEnv *
 JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12173,18 +15920,24 @@ JNI_METHOD(void, ColorControlCluster, readColorModeAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12193,38 +15946,50 @@ JNI_METHOD(void, ColorControlCluster, readColorControlOptionsAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorControlOptions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfPrimaries(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12236,15 +16001,20 @@ JNI_METHOD(void, ColorControlCluster, readNumberOfPrimariesAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12256,15 +16026,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12273,18 +16048,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary1Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12296,15 +16077,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary1IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12316,15 +16102,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12333,18 +16124,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary2Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12356,15 +16153,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary2IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12376,15 +16178,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12393,18 +16200,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary3Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12416,15 +16229,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary3IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12436,15 +16254,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12453,18 +16276,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary4Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12476,15 +16305,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary4IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12496,15 +16330,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12513,18 +16352,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary5Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12536,15 +16381,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary5IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6X(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12556,15 +16406,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6XAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6Y(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12573,18 +16428,24 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6YAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePrimary6Intensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12596,15 +16457,20 @@ JNI_METHOD(void, ColorControlCluster, readPrimary6IntensityAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12613,21 +16479,27 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointXAttribute)(JNIEnv * env, jo
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeWhitePointX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12636,15 +16508,20 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointXAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12653,21 +16530,27 @@ JNI_METHOD(void, ColorControlCluster, readWhitePointYAttribute)(JNIEnv * env, jo
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeWhitePointY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12676,15 +16559,20 @@ JNI_METHOD(void, ColorControlCluster, writeWhitePointYAttribute)(JNIEnv * env, j
 JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12693,21 +16581,27 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12716,15 +16610,20 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRXAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12733,38 +16632,50 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRYAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12773,21 +16684,27 @@ JNI_METHOD(void, ColorControlCluster, readColorPointRIntensityAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointRIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12796,15 +16713,20 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)(JNIEnv
 JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12813,21 +16735,27 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12836,15 +16764,20 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGXAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12853,38 +16786,50 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGYAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12893,21 +16838,27 @@ JNI_METHOD(void, ColorControlCluster, readColorPointGIntensityAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointGIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12916,15 +16867,20 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)(JNIEnv
 JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12933,21 +16889,27 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBXAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBX(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -12956,15 +16918,20 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBXAttribute)(JNIEnv * env,
 JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -12973,38 +16940,50 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBYAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBYAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBY(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13013,38 +16992,50 @@ JNI_METHOD(void, ColorControlCluster, readColorPointBIntensityAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeColorPointBIntensity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnhancedCurrentHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13053,18 +17044,24 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedCurrentHueAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnhancedColorMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13076,15 +17073,20 @@ JNI_METHOD(void, ColorControlCluster, readEnhancedColorModeAttribute)(JNIEnv * e
 JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopActive(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13093,18 +17095,24 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopActiveAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopDirection(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13116,15 +17124,20 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopDirectionAttribute)(JNIEnv *
 JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13133,18 +17146,24 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopTimeAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopStartEnhancedHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13153,18 +17172,24 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStartEnhancedHueAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorLoopStoredEnhancedHue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13173,18 +17198,24 @@ JNI_METHOD(void, ColorControlCluster, readColorLoopStoredEnhancedHueAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorCapabilities(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13193,18 +17224,24 @@ JNI_METHOD(void, ColorControlCluster, readColorCapabilitiesAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTempPhysicalMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13213,18 +17250,24 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMinAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeColorTempPhysicalMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13233,18 +17276,24 @@ JNI_METHOD(void, ColorControlCluster, readColorTempPhysicalMaxAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCoupleColorTempToLevelMinMireds(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13253,18 +17302,24 @@ JNI_METHOD(void, ColorControlCluster, readCoupleColorTempToLevelMinMiredsAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13273,21 +17328,28 @@ JNI_METHOD(void, ColorControlCluster, readStartUpColorTemperatureMiredsAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err = cppCluster->WriteAttributeStartUpColorTemperatureMireds(onSuccess->Cancel(), onFailure->Cancel(),
+                                                                  static_cast<uint16_t>(value));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -13296,15 +17358,20 @@ JNI_METHOD(void, ColorControlCluster, writeStartUpColorTemperatureMiredsAttribut
 JNI_METHOD(void, ColorControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     ColorControlCluster * cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13321,105 +17388,141 @@ JNI_METHOD(jlong, ContentLauncherCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ContentLauncherCluster, launchContent)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean autoPlay, jstring data)
+JNI_METHOD(void, ContentLauncherCluster, launchContent)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean autoPlay, jstring data)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
-    
+
     JniUtfString dataStr(env, data);
-    
-    std::unique_ptr<CHIPContentLauncherClusterLaunchContentResponseCallback, void (*)(CHIPContentLauncherClusterLaunchContentResponseCallback *)> onSuccess(
-        Platform::New<CHIPContentLauncherClusterLaunchContentResponseCallback>(callback), Platform::Delete<CHIPContentLauncherClusterLaunchContentResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPContentLauncherClusterLaunchContentResponseCallback,
+                    void (*)(CHIPContentLauncherClusterLaunchContentResponseCallback *)>
+        onSuccess(Platform::New<CHIPContentLauncherClusterLaunchContentResponseCallback>(callback),
+                  Platform::Delete<CHIPContentLauncherClusterLaunchContentResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
+=======
+    err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay,
+                                    chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ContentLauncherCluster, launchURL)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString)
+JNI_METHOD(void, ContentLauncherCluster, launchURL)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring contentURL, jstring displayString)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster;
-    
+
     JniUtfString contentURLStr(env, contentURL);
-        JniUtfString displayStringStr(env, displayString);
-    
-    std::unique_ptr<CHIPContentLauncherClusterLaunchURLResponseCallback, void (*)(CHIPContentLauncherClusterLaunchURLResponseCallback *)> onSuccess(
-        Platform::New<CHIPContentLauncherClusterLaunchURLResponseCallback>(callback), Platform::Delete<CHIPContentLauncherClusterLaunchURLResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    JniUtfString displayStringStr(env, displayString);
+
+    std::unique_ptr<CHIPContentLauncherClusterLaunchURLResponseCallback,
+                    void (*)(CHIPContentLauncherClusterLaunchURLResponseCallback *)>
+        onSuccess(Platform::New<CHIPContentLauncherClusterLaunchURLResponseCallback>(callback),
+                  Platform::Delete<CHIPContentLauncherClusterLaunchURLResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(contentURLStr.c_str(), strlen(contentURLStr.c_str())), chip::CharSpan(displayStringStr.c_str(), strlen(displayStringStr.c_str())));
+=======
+    err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(),
+                                chip::ByteSpan((const uint8_t *) contentURL, strlen(contentURLStr.c_str())),
+                                chip::ByteSpan((const uint8_t *) displayString, strlen(displayStringStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback, void (*)(CHIPContentLauncherAcceptsHeaderListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPContentLauncherAcceptsHeaderListAttributeCallback>(callback), Platform::Delete<CHIPContentLauncherAcceptsHeaderListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback,
+                    void (*)(CHIPContentLauncherAcceptsHeaderListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPContentLauncherAcceptsHeaderListAttributeCallback>(callback),
+                  Platform::Delete<CHIPContentLauncherAcceptsHeaderListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAcceptsHeaderList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13428,19 +17531,26 @@ JNI_METHOD(void, ContentLauncherCluster, readAcceptsHeaderListAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback, void (*)(CHIPContentLauncherSupportedStreamingTypesAttributeCallback *)> onSuccess(
-        Platform::New<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>(callback), Platform::Delete<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback,
+                    void (*)(CHIPContentLauncherSupportedStreamingTypesAttributeCallback *)>
+        onSuccess(Platform::New<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>(callback),
+                  Platform::Delete<CHIPContentLauncherSupportedStreamingTypesAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSupportedStreamingTypes(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13449,18 +17559,24 @@ JNI_METHOD(void, ContentLauncherCluster, readSupportedStreamingTypesAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ContentLauncherCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     ContentLauncherCluster * cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13477,20 +17593,24 @@ JNI_METHOD(jlong, DescriptorCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, DescriptorCluster, readDeviceListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback, void (*)(CHIPDescriptorDeviceListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorDeviceListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorDeviceListAttributeCallback>(callback),
+        Platform::Delete<CHIPDescriptorDeviceListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDeviceList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13503,15 +17623,20 @@ JNI_METHOD(void, DescriptorCluster, readServerListAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorServerListAttributeCallback, void (*)(CHIPDescriptorServerListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorServerListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorServerListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorServerListAttributeCallback>(callback),
+        Platform::Delete<CHIPDescriptorServerListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeServerList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13524,15 +17649,20 @@ JNI_METHOD(void, DescriptorCluster, readClientListAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorClientListAttributeCallback, void (*)(CHIPDescriptorClientListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorClientListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorClientListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorClientListAttributeCallback>(callback),
+        Platform::Delete<CHIPDescriptorClientListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClientList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13545,15 +17675,20 @@ JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobjec
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPDescriptorPartsListAttributeCallback, void (*)(CHIPDescriptorPartsListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPDescriptorPartsListAttributeCallback>(callback), Platform::Delete<CHIPDescriptorPartsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPDescriptorPartsListAttributeCallback>(callback),
+        Platform::Delete<CHIPDescriptorPartsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13565,15 +17700,20 @@ JNI_METHOD(void, DescriptorCluster, readPartsListAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, DescriptorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     DescriptorCluster * cppCluster = reinterpret_cast<DescriptorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13590,23 +17730,33 @@ JNI_METHOD(jlong, DiagnosticLogsCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint intent, jint requestedProtocol, jbyteArray transferFileDesignator)
+JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint intent, jint requestedProtocol,
+ jbyteArray transferFileDesignator)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DiagnosticLogsCluster * cppCluster;
-    
+
     JniByteArray transferFileDesignatorArr(env, transferFileDesignator);
 
+<<<<<<< HEAD
     std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback, void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)> onSuccess(
         Platform::New<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>(callback), Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
     std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+=======
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DiagnosticLogsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->RetrieveLogsRequest(
         onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(intent), static_cast<uint8_t>(requestedProtocol),
@@ -13614,26 +17764,36 @@ JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)(JNIEnv * env, jobje
 =======
     err = cppCluster->RetrieveLogsRequest(onSuccess->Cancel(), onFailure->Cancel(), intent, requestedProtocol, chip::ByteSpan((const uint8_t*) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->RetrieveLogsRequest(
+        onSuccess->Cancel(), onFailure->Cancel(), intent, requestedProtocol,
+        chip::ByteSpan((const uint8_t *) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13652,11 +17812,12 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearAllPinsResponseCallback, void (*)(CHIPDoorLockClusterClearAllPinsResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearAllPinsResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearAllPinsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearAllPinsResponseCallback, void (*)(CHIPDoorLockClusterClearAllPinsResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearAllPinsResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearAllPinsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13666,24 +17827,29 @@ JNI_METHOD(void, DoorLockCluster, clearAllPins)(JNIEnv * env, jobject self, jlon
     err = cppCluster->ClearAllPins(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13693,11 +17859,12 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearAllRfidsResponseCallback, void (*)(CHIPDoorLockClusterClearAllRfidsResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearAllRfidsResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearAllRfidsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearAllRfidsResponseCallback, void (*)(CHIPDoorLockClusterClearAllRfidsResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearAllRfidsResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearAllRfidsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13707,38 +17874,46 @@ JNI_METHOD(void, DoorLockCluster, clearAllRfids)(JNIEnv * env, jobject self, jlo
     err = cppCluster->ClearAllRfids(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
+JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearHolidayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearHolidayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterClearHolidayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13748,24 +17923,29 @@ JNI_METHOD(void, DoorLockCluster, clearHolidaySchedule)(JNIEnv * env, jobject se
     err = cppCluster->ClearHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13775,11 +17955,12 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPDoorLockClusterClearPinResponseCallback, void (*)(CHIPDoorLockClusterClearPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterClearPinResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterClearPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13789,24 +17970,29 @@ JNI_METHOD(void, DoorLockCluster, clearPin)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->ClearPin(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13816,11 +18002,12 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearRfidResponseCallback, void (*)(CHIPDoorLockClusterClearRfidResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearRfidResponseCallback, void (*)(CHIPDoorLockClusterClearRfidResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearRfidResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13830,38 +18017,46 @@ JNI_METHOD(void, DoorLockCluster, clearRfid)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->ClearRfid(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterClearWeekdayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13871,38 +18066,46 @@ JNI_METHOD(void, DoorLockCluster, clearWeekdaySchedule)(JNIEnv * env, jobject se
     err = cppCluster->ClearWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterClearYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterClearYeardayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterClearYeardayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterClearYeardayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterClearYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13912,38 +18115,46 @@ JNI_METHOD(void, DoorLockCluster, clearYeardaySchedule)(JNIEnv * env, jobject se
     err = cppCluster->ClearYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
+JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetHolidayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetHolidayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterGetHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13952,25 +18163,30 @@ JNI_METHOD(void, DoorLockCluster, getHolidaySchedule)(JNIEnv * env, jobject self
 
     err = cppCluster->GetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId);
     SuccessOrExit(err);
-
-exit: 
-    if (err != CHIP_NO_ERROR) {
+
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13980,11 +18196,12 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterGetLogRecordResponseCallback, void (*)(CHIPDoorLockClusterGetLogRecordResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetLogRecordResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetLogRecordResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetLogRecordResponseCallback, void (*)(CHIPDoorLockClusterGetLogRecordResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterGetLogRecordResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterGetLogRecordResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13994,24 +18211,29 @@ JNI_METHOD(void, DoorLockCluster, getLogRecord)(JNIEnv * env, jobject self, jlon
     err = cppCluster->GetLogRecord(onSuccess->Cancel(), onFailure->Cancel(), logIndex);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14021,11 +18243,12 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPDoorLockClusterGetPinResponseCallback, void (*)(CHIPDoorLockClusterGetPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterGetPinResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterGetPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14035,24 +18258,29 @@ JNI_METHOD(void, DoorLockCluster, getPin)(JNIEnv * env, jobject self, jlong clus
     err = cppCluster->GetPin(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14062,11 +18290,12 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPDoorLockClusterGetRfidResponseCallback, void (*)(CHIPDoorLockClusterGetRfidResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterGetRfidResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterGetRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14076,24 +18305,29 @@ JNI_METHOD(void, DoorLockCluster, getRfid)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->GetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14103,11 +18337,12 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterGetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterGetUserTypeResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetUserTypeResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetUserTypeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterGetUserTypeResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterGetUserTypeResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterGetUserTypeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14117,38 +18352,46 @@ JNI_METHOD(void, DoorLockCluster, getUserType)(JNIEnv * env, jobject self, jlong
     err = cppCluster->GetUserType(onSuccess->Cancel(), onFailure->Cancel(), userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetWeekdayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterGetWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14158,38 +18401,46 @@ JNI_METHOD(void, DoorLockCluster, getWeekdaySchedule)(JNIEnv * env, jobject self
     err = cppCluster->GetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
+JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterGetYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterGetYeardayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterGetYeardayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterGetYeardayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterGetYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14199,24 +18450,29 @@ JNI_METHOD(void, DoorLockCluster, getYeardaySchedule)(JNIEnv * env, jobject self
     err = cppCluster->GetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14226,188 +18482,234 @@ JNI_METHOD(void, DoorLockCluster, lockDoor)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
+
     JniByteArray pinArr(env, pin);
 
     std::unique_ptr<CHIPDoorLockClusterLockDoorResponseCallback, void (*)(CHIPDoorLockClusterLockDoorResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterLockDoorResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterLockDoorResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterLockDoorResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterLockDoorResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->LockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
+    err = cppCluster->LockDoor(onSuccess->Cancel(), onFailure->Cancel(),
+                               chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jlong localStartTime, jlong localEndTime, jint operatingModeDuringHoliday)
+JNI_METHOD(void, DoorLockCluster, setHolidaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jlong localStartTime, jlong localEndTime,
+ jint operatingModeDuringHoliday)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterSetHolidayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetHolidayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetHolidayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterSetHolidayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterSetHolidayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    err = cppCluster->SetHolidaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, localStartTime, localEndTime,
+                                         operatingModeDuringHoliday);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setPin)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray pin)
+JNI_METHOD(void, DoorLockCluster, setPin)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray pin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
+
     JniByteArray pinArr(env, pin);
 
     std::unique_ptr<CHIPDoorLockClusterSetPinResponseCallback, void (*)(CHIPDoorLockClusterSetPinResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetPinResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetPinResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterSetPinResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterSetPinResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                              static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
 =======
     err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
+                             chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setRfid)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray id)
+JNI_METHOD(void, DoorLockCluster, setRfid)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userStatus, jint userType, jbyteArray id)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
+
     JniByteArray idArr(env, id);
 
     std::unique_ptr<CHIPDoorLockClusterSetRfidResponseCallback, void (*)(CHIPDoorLockClusterSetRfidResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetRfidResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetRfidResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPDoorLockClusterSetRfidResponseCallback>(callback),
+        Platform::Delete<CHIPDoorLockClusterSetRfidResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                               static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) idArr.data(), idArr.size()));
 =======
     err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) idArr.data(), idArr.size()));
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
+                              chip::ByteSpan((const uint8_t *) idArr.data(), idArr.size()));
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setUserType)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userType)
+JNI_METHOD(void, DoorLockCluster, setUserType)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint userId, jint userType)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterSetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterSetUserTypeResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetUserTypeResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetUserTypeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetUserTypeResponseCallback, void (*)(CHIPDoorLockClusterSetUserTypeResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterSetUserTypeResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterSetUserTypeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14417,106 +18719,131 @@ JNI_METHOD(void, DoorLockCluster, setUserType)(JNIEnv * env, jobject self, jlong
     err = cppCluster->SetUserType(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userType));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jint daysMask, jint startHour, jint startMinute, jint endHour, jint endMinute)
+JNI_METHOD(void, DoorLockCluster, setWeekdaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jint daysMask, jint startHour,
+ jint startMinute, jint endHour, jint endMinute)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterSetWeekdayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterSetWeekdayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    err = cppCluster->SetWeekdaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, daysMask, startHour,
+                                         startMinute, endHour, endMinute);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jlong localStartTime, jlong localEndTime)
+JNI_METHOD(void, DoorLockCluster, setYeardaySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint scheduleId, jint userId, jlong localStartTime,
+ jlong localEndTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDoorLockClusterSetYeardayScheduleResponseCallback, void (*)(CHIPDoorLockClusterSetYeardayScheduleResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterSetYeardayScheduleResponseCallback,
+                    void (*)(CHIPDoorLockClusterSetYeardayScheduleResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterSetYeardayScheduleResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
+    err =
+        cppCluster->SetYeardaySchedule(onSuccess->Cancel(), onFailure->Cancel(), scheduleId, userId, localStartTime, localEndTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14526,81 +18853,99 @@ JNI_METHOD(void, DoorLockCluster, unlockDoor)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
+
     JniByteArray pinArr(env, pin);
 
-    std::unique_ptr<CHIPDoorLockClusterUnlockDoorResponseCallback, void (*)(CHIPDoorLockClusterUnlockDoorResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterUnlockDoorResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterUnlockDoorResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterUnlockDoorResponseCallback, void (*)(CHIPDoorLockClusterUnlockDoorResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterUnlockDoorResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterUnlockDoorResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
+    err = cppCluster->UnlockDoor(onSuccess->Cancel(), onFailure->Cancel(),
+                                 chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint timeoutInSeconds, jbyteArray pin)
+JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint timeoutInSeconds, jbyteArray pin)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster;
-    
+
     JniByteArray pinArr(env, pin);
 
-    std::unique_ptr<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback, void (*)(CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *)> onSuccess(
-        Platform::New<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>(callback), Platform::Delete<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback,
+                    void (*)(CHIPDoorLockClusterUnlockWithTimeoutResponseCallback *)>
+        onSuccess(Platform::New<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>(callback),
+                  Platform::Delete<CHIPDoorLockClusterUnlockWithTimeoutResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds, chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
+    err = cppCluster->UnlockWithTimeout(onSuccess->Cancel(), onFailure->Cancel(), timeoutInSeconds,
+                                        chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -14609,15 +18954,20 @@ JNI_METHOD(void, DoorLockCluster, unlockWithTimeout)(JNIEnv * env, jobject self,
 JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLockState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14626,20 +18976,27 @@ JNI_METHOD(void, DoorLockCluster, readLockStateAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeLockState(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                  static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -14649,15 +19006,19 @@ JNI_METHOD(void, DoorLockCluster, subscribeLockStateAttribute)(JNIEnv * env, job
 JNI_METHOD(void, DoorLockCluster, reportLockStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeLockState(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -14665,15 +19026,20 @@ JNI_METHOD(void, DoorLockCluster, reportLockStateAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLockType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14685,15 +19051,20 @@ JNI_METHOD(void, DoorLockCluster, readLockTypeAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActuatorEnabled(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14705,15 +19076,20 @@ JNI_METHOD(void, DoorLockCluster, readActuatorEnabledAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, DoorLockCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     DoorLockCluster * cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14730,19 +19106,24 @@ JNI_METHOD(jlong, ElectricalMeasurementCluster, initWithDevice)(JNIEnv * env, jo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasurementType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14751,18 +19132,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readMeasurementTypeAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTotalActivePower(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14771,18 +19158,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readTotalActivePowerAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14791,18 +19184,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltageMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14811,18 +19210,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMinAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsVoltageMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14831,18 +19236,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsVoltageMaxAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrent(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14851,18 +19262,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrentMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14871,18 +19288,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMinAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRmsCurrentMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14891,18 +19314,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readRmsCurrentMaxAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePower(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14911,18 +19340,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePowerMin(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14931,18 +19366,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMinAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActivePowerMax(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14951,18 +19392,24 @@ JNI_METHOD(void, ElectricalMeasurementCluster, readActivePowerMaxAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ElectricalMeasurementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                            = CHIP_NO_ERROR;
     ElectricalMeasurementCluster * cppCluster = reinterpret_cast<ElectricalMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14984,10 +19431,11 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -14997,41 +19445,52 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, j
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePHYRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15040,18 +19499,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPHYRateAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFullDuplex(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15060,18 +19525,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readFullDuplexAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15080,18 +19551,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketRxCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15100,18 +19577,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readPacketTxCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15120,18 +19603,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTxErrCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCollisionCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15140,18 +19629,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCollisionCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15160,18 +19655,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readOverrunCountAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCarrierDetect(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15180,18 +19681,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readCarrierDetectAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTimeSinceReset(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15200,18 +19707,24 @@ JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readTimeSinceResetAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, EthernetNetworkDiagnosticsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     EthernetNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<EthernetNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15228,20 +19741,24 @@ JNI_METHOD(jlong, FixedLabelCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback, void (*)(CHIPFixedLabelLabelListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPFixedLabelLabelListAttributeCallback>(callback), Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPFixedLabelLabelListAttributeCallback>(callback),
+        Platform::Delete<CHIPFixedLabelLabelListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     FixedLabelCluster * cppCluster = reinterpret_cast<FixedLabelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLabelList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15253,15 +19770,20 @@ JNI_METHOD(void, FixedLabelCluster, readLabelListAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, FixedLabelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     FixedLabelCluster * cppCluster = reinterpret_cast<FixedLabelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15278,19 +19800,23 @@ JNI_METHOD(jlong, FlowMeasurementCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15299,18 +19825,24 @@ JNI_METHOD(void, FlowMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15319,18 +19851,24 @@ JNI_METHOD(void, FlowMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15339,6 +19877,7 @@ JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv *
     onFailure.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, FlowMeasurementCluster, readToleranceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -15370,17 +19909,26 @@ JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
 =======
 JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     FlowMeasurementCluster * cppCluster = reinterpret_cast<FlowMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15397,16 +19945,19 @@ JNI_METHOD(jlong, GeneralCommissioningCluster, initWithDevice)(JNIEnv * env, job
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint expiryLengthSeconds, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint expiryLengthSeconds, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback, void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)> onSuccess(
-        Platform::New<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback,
+                    void (*)(CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *)>
+        onSuccess(Platform::New<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>(callback),
+                  Platform::Delete<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15416,24 +19967,29 @@ JNI_METHOD(void, GeneralCommissioningCluster, armFailSafe)(JNIEnv * env, jobject
     err = cppCluster->ArmFailSafe(onSuccess->Cancel(), onFailure->Cancel(), expiryLengthSeconds, breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -15443,11 +19999,13 @@ JNI_METHOD(void, GeneralCommissioningCluster, commissioningComplete)(JNIEnv * en
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback, void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)> onSuccess(
-        Platform::New<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback,
+                    void (*)(CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *)>
+        onSuccess(Platform::New<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>(callback),
+                  Platform::Delete<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15457,45 +20015,56 @@ JNI_METHOD(void, GeneralCommissioningCluster, commissioningComplete)(JNIEnv * en
     err = cppCluster->CommissioningComplete(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint location, jstring countryCode, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint location, jstring countryCode, jlong breadcrumb,
+ jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster;
-    
+
     JniUtfString countryCodeStr(env, countryCode);
-    
-    std::unique_ptr<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback, void (*)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *)> onSuccess(
-        Platform::New<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(callback), Platform::Delete<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback,
+                    void (*)(CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *)>
+        onSuccess(Platform::New<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>(callback),
+                  Platform::Delete<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(location),
                                           chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb,
@@ -15503,43 +20072,62 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)(JNIEnv * env,
 =======
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
+=======
+    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location,
+                                          chip::ByteSpan((const uint8_t *) countryCode, strlen(countryCodeStr.c_str())), breadcrumb,
+                                          timeoutMs);
+>>>>>>> b8d7ee0e3 (callback generation done)
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15548,39 +20136,52 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBreadcrumbAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, GeneralCommissioningCluster, writeBreadcrumbAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBreadcrumb(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback, void (*)(CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>(callback), Platform::Delete<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback,
+                    void (*)(CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>(callback),
+                  Platform::Delete<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBasicCommissioningInfoList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15589,18 +20190,24 @@ JNI_METHOD(void, GeneralCommissioningCluster, readBasicCommissioningInfoListAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralCommissioningCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     GeneralCommissioningCluster * cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15617,20 +20224,26 @@ JNI_METHOD(jlong, GeneralDiagnosticsCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback, void (*)(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *)> onSuccess(
-        Platform::New<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback), Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback,
+                    void (*)(CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *)>
+        onSuccess(Platform::New<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>(callback),
+                  Platform::Delete<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNetworkInterfaces(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15639,18 +20252,24 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readNetworkInterfacesAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRebootCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15662,15 +20281,20 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readRebootCountAttribute)(JNIEnv * e
 JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUpTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15679,18 +20303,24 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readUpTimeAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTotalOperationalHours(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15699,18 +20329,24 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readTotalOperationalHoursAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBootReasons(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15719,18 +20355,24 @@ JNI_METHOD(void, GeneralDiagnosticsCluster, readBootReasonsAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GeneralDiagnosticsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GeneralDiagnosticsCluster * cppCluster = reinterpret_cast<GeneralDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15747,20 +20389,24 @@ JNI_METHOD(jlong, GroupKeyManagementCluster, initWithDevice)(JNIEnv * env, jobje
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback, void (*)(CHIPGroupKeyManagementGroupsAttributeCallback *)> onSuccess(
-        Platform::New<CHIPGroupKeyManagementGroupsAttributeCallback>(callback), Platform::Delete<CHIPGroupKeyManagementGroupsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback, void (*)(CHIPGroupKeyManagementGroupsAttributeCallback *)>
+        onSuccess(Platform::New<CHIPGroupKeyManagementGroupsAttributeCallback>(callback),
+                  Platform::Delete<CHIPGroupKeyManagementGroupsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGroups(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15772,16 +20418,21 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupsAttribute)(JNIEnv * env, j
 JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback, void (*)(CHIPGroupKeyManagementGroupKeysAttributeCallback *)> onSuccess(
-        Platform::New<CHIPGroupKeyManagementGroupKeysAttributeCallback>(callback), Platform::Delete<CHIPGroupKeyManagementGroupKeysAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback, void (*)(CHIPGroupKeyManagementGroupKeysAttributeCallback *)>
+        onSuccess(Platform::New<CHIPGroupKeyManagementGroupKeysAttributeCallback>(callback),
+                  Platform::Delete<CHIPGroupKeyManagementGroupKeysAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGroupKeys(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15790,18 +20441,24 @@ JNI_METHOD(void, GroupKeyManagementCluster, readGroupKeysAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, GroupKeyManagementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                         = CHIP_NO_ERROR;
     GroupKeyManagementCluster * cppCluster = reinterpret_cast<GroupKeyManagementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -15818,99 +20475,128 @@ JNI_METHOD(jlong, GroupsCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, GroupsCluster, addGroup)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
+JNI_METHOD(void, GroupsCluster, addGroup)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
+
     JniUtfString groupNameStr(env, groupName);
-    
+
     std::unique_ptr<CHIPGroupsClusterAddGroupResponseCallback, void (*)(CHIPGroupsClusterAddGroupResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterAddGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPGroupsClusterAddGroupResponseCallback>(callback),
+        Platform::Delete<CHIPGroupsClusterAddGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
+=======
+    err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId,
+                               chip::ByteSpan((const uint8_t *) groupName, strlen(groupNameStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
+JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jstring groupName)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
+
     JniUtfString groupNameStr(env, groupName);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
+=======
+    err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId,
+                                            chip::ByteSpan((const uint8_t *) groupName, strlen(groupNameStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, GroupsCluster, getGroupMembership)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupCount, jint groupList)
+JNI_METHOD(void, GroupsCluster, getGroupMembership)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupCount, jint groupList)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback, void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterGetGroupMembershipResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGroupsClusterGetGroupMembershipResponseCallback,
+                    void (*)(CHIPGroupsClusterGetGroupMembershipResponseCallback *)>
+        onSuccess(Platform::New<CHIPGroupsClusterGetGroupMembershipResponseCallback>(callback),
+                  Platform::Delete<CHIPGroupsClusterGetGroupMembershipResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15920,24 +20606,29 @@ JNI_METHOD(void, GroupsCluster, getGroupMembership)(JNIEnv * env, jobject self,
     err = cppCluster->GetGroupMembership(onSuccess->Cancel(), onFailure->Cancel(), groupCount, groupList);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -15947,10 +20638,11 @@ JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -15960,24 +20652,29 @@ JNI_METHOD(void, GroupsCluster, removeAllGroups)(JNIEnv * env, jobject self, jlo
     err = cppCluster->RemoveAllGroups(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -15987,11 +20684,12 @@ JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong c
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterRemoveGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPGroupsClusterRemoveGroupResponseCallback, void (*)(CHIPGroupsClusterRemoveGroupResponseCallback *)>
+        onSuccess(Platform::New<CHIPGroupsClusterRemoveGroupResponseCallback>(callback),
+                  Platform::Delete<CHIPGroupsClusterRemoveGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16001,24 +20699,29 @@ JNI_METHOD(void, GroupsCluster, removeGroup)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->RemoveGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16028,11 +20731,12 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     GroupsCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPGroupsClusterViewGroupResponseCallback, void (*)(CHIPGroupsClusterViewGroupResponseCallback *)> onSuccess(
-        Platform::New<CHIPGroupsClusterViewGroupResponseCallback>(callback), Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPGroupsClusterViewGroupResponseCallback>(callback),
+        Platform::Delete<CHIPGroupsClusterViewGroupResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16042,24 +20746,29 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->ViewGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16068,15 +20777,20 @@ JNI_METHOD(void, GroupsCluster, viewGroup)(JNIEnv * env, jobject self, jlong clu
 JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     GroupsCluster * cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNameSupport(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16088,15 +20802,20 @@ JNI_METHOD(void, GroupsCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, GroupsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     GroupsCluster * cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16118,10 +20837,11 @@ JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong cl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16131,24 +20851,29 @@ JNI_METHOD(void, IdentifyCluster, identify)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->Identify(onSuccess->Cancel(), onFailure->Cancel(), identifyTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16158,11 +20883,12 @@ JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPIdentifyClusterIdentifyQueryResponseCallback, void (*)(CHIPIdentifyClusterIdentifyQueryResponseCallback *)> onSuccess(
-        Platform::New<CHIPIdentifyClusterIdentifyQueryResponseCallback>(callback), Platform::Delete<CHIPIdentifyClusterIdentifyQueryResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPIdentifyClusterIdentifyQueryResponseCallback, void (*)(CHIPIdentifyClusterIdentifyQueryResponseCallback *)>
+        onSuccess(Platform::New<CHIPIdentifyClusterIdentifyQueryResponseCallback>(callback),
+                  Platform::Delete<CHIPIdentifyClusterIdentifyQueryResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16172,37 +20898,44 @@ JNI_METHOD(void, IdentifyCluster, identifyQuery)(JNIEnv * env, jobject self, jlo
     err = cppCluster->IdentifyQuery(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, IdentifyCluster, triggerEffect)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectIdentifier, jint effectVariant)
+JNI_METHOD(void, IdentifyCluster, triggerEffect)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectIdentifier, jint effectVariant)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16213,24 +20946,29 @@ JNI_METHOD(void, IdentifyCluster, triggerEffect)(JNIEnv * env, jobject self, jlo
                                     static_cast<uint8_t>(effectVariant));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16239,15 +20977,20 @@ JNI_METHOD(void, IdentifyCluster, triggerEffect)(JNIEnv * env, jobject self, jlo
 JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16256,21 +20999,27 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTimeAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeIdentifyTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -16279,15 +21028,20 @@ JNI_METHOD(void, IdentifyCluster, writeIdentifyTimeAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeIdentifyType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16299,15 +21053,20 @@ JNI_METHOD(void, IdentifyCluster, readIdentifyTypeAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, IdentifyCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     IdentifyCluster * cppCluster = reinterpret_cast<IdentifyCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16541,11 +21300,12 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     KeypadInputCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)> onSuccess(
-        Platform::New<CHIPKeypadInputClusterSendKeyResponseCallback>(callback), Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPKeypadInputClusterSendKeyResponseCallback, void (*)(CHIPKeypadInputClusterSendKeyResponseCallback *)>
+        onSuccess(Platform::New<CHIPKeypadInputClusterSendKeyResponseCallback>(callback),
+                  Platform::Delete<CHIPKeypadInputClusterSendKeyResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16555,24 +21315,29 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
     err = cppCluster->SendKey(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(keyCode));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16581,15 +21346,20 @@ JNI_METHOD(void, KeypadInputCluster, sendKey)(JNIEnv * env, jobject self, jlong
 JNI_METHOD(void, KeypadInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     KeypadInputCluster * cppCluster = reinterpret_cast<KeypadInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16606,15 +21376,17 @@ JNI_METHOD(jlong, LevelControlCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, LevelControlCluster, move)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, move)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16625,37 +21397,45 @@ JNI_METHOD(void, LevelControlCluster, move)(JNIEnv * env, jobject self, jlong cl
                            optionOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveToLevel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, moveToLevel)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime, jint optionMask,
+ jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16665,37 +21445,44 @@ JNI_METHOD(void, LevelControlCluster, moveToLevel)(JNIEnv * env, jobject self, j
     err = cppCluster->MoveToLevel(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime, optionMask, optionOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime)
+JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint level, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16705,37 +21492,44 @@ JNI_METHOD(void, LevelControlCluster, moveToLevelWithOnOff)(JNIEnv * env, jobjec
     err = cppCluster->MoveToLevelWithOnOff(onSuccess->Cancel(), onFailure->Cancel(), level, transitionTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, moveWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate)
+JNI_METHOD(void, LevelControlCluster, moveWithOnOff)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint moveMode, jint rate)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16745,82 +21539,102 @@ JNI_METHOD(void, LevelControlCluster, moveWithOnOff)(JNIEnv * env, jobject self,
     err = cppCluster->MoveWithOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(moveMode), rate);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, step)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, step)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime, jint optionMask,
+ jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                            optionMask, optionOverride);
 =======
     err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err =
+        cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, stepWithOnOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime)
+JNI_METHOD(void, LevelControlCluster, stepWithOnOff)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint stepMode, jint stepSize, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16831,37 +21645,44 @@ JNI_METHOD(void, LevelControlCluster, stepWithOnOff)(JNIEnv * env, jobject self,
                                     transitionTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, LevelControlCluster, stop)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionMask, jint optionOverride)
+JNI_METHOD(void, LevelControlCluster, stop)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint optionMask, jint optionOverride)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16871,24 +21692,29 @@ JNI_METHOD(void, LevelControlCluster, stop)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->Stop(onSuccess->Cancel(), onFailure->Cancel(), optionMask, optionOverride);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16898,10 +21724,11 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -16911,24 +21738,29 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
     err = cppCluster->StopWithOnOff(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -16937,15 +21769,20 @@ JNI_METHOD(void, LevelControlCluster, stopWithOnOff)(JNIEnv * env, jobject self,
 JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -16954,20 +21791,27 @@ JNI_METHOD(void, LevelControlCluster, readCurrentLevelAttribute)(JNIEnv * env, j
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                     static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -16977,15 +21821,19 @@ JNI_METHOD(void, LevelControlCluster, subscribeCurrentLevelAttribute)(JNIEnv * e
 JNI_METHOD(void, LevelControlCluster, reportCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentLevel(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -17393,15 +22241,20 @@ JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)(JNIEnv
 JNI_METHOD(void, LevelControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17423,10 +22276,11 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     LowPowerCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17436,24 +22290,29 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
     err = cppCluster->Sleep(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17462,15 +22321,20 @@ JNI_METHOD(void, LowPowerCluster, sleep)(JNIEnv * env, jobject self, jlong clust
 JNI_METHOD(void, LowPowerCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err               = CHIP_NO_ERROR;
     LowPowerCluster * cppCluster = reinterpret_cast<LowPowerCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17492,10 +22356,11 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17505,65 +22370,83 @@ JNI_METHOD(void, MediaInputCluster, hideInputStatus)(JNIEnv * env, jobject self,
     err = cppCluster->HideInputStatus(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaInputCluster, renameInput)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
+JNI_METHOD(void, MediaInputCluster, renameInput)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint index, jstring name)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-    
+
     JniUtfString nameStr(env, name);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
+=======
+    err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index,
+                                  chip::ByteSpan((const uint8_t *) name, strlen(nameStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17573,10 +22456,11 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17586,24 +22470,29 @@ JNI_METHOD(void, MediaInputCluster, selectInput)(JNIEnv * env, jobject self, jlo
     err = cppCluster->SelectInput(onSuccess->Cancel(), onFailure->Cancel(), index);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17613,10 +22502,11 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17626,24 +22516,29 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
     err = cppCluster->ShowInputStatus(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17652,16 +22547,21 @@ JNI_METHOD(void, MediaInputCluster, showInputStatus)(JNIEnv * env, jobject self,
 JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback, void (*)(CHIPMediaInputMediaInputListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPMediaInputMediaInputListAttributeCallback>(callback), Platform::Delete<CHIPMediaInputMediaInputListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback, void (*)(CHIPMediaInputMediaInputListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPMediaInputMediaInputListAttributeCallback>(callback),
+                  Platform::Delete<CHIPMediaInputMediaInputListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMediaInputList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17673,15 +22573,20 @@ JNI_METHOD(void, MediaInputCluster, readMediaInputListAttribute)(JNIEnv * env, j
 JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentMediaInput(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17693,15 +22598,20 @@ JNI_METHOD(void, MediaInputCluster, readCurrentMediaInputAttribute)(JNIEnv * env
 JNI_METHOD(void, MediaInputCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     MediaInputCluster * cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -17723,11 +22633,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaFastForwardResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaFastForwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17737,24 +22649,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaFastForward)(JNIEnv * env, jobject s
     err = cppCluster->MediaFastForward(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17764,11 +22681,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaNextResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaNextResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaNextResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaNextResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaNextResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaNextResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaNextResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaNextResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17778,24 +22697,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaNext)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaNext(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17805,11 +22729,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPauseResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPauseResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaPauseResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPauseResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPauseResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaPauseResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPauseResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaPauseResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17819,24 +22745,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPause)(JNIEnv * env, jobject self, j
     err = cppCluster->MediaPause(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17846,11 +22777,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPlayResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPlayResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaPlayResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPlayResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPlayResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaPlayResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPlayResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaPlayResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17860,24 +22793,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPlay)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaPlay(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17887,11 +22825,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaPreviousResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaPreviousResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaPreviousResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaPreviousResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaPreviousResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17901,24 +22841,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaPrevious)(JNIEnv * env, jobject self
     err = cppCluster->MediaPrevious(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17928,11 +22873,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaRewindResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaRewindResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaRewindResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaRewindResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaRewindResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaRewindResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaRewindResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaRewindResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17942,24 +22889,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaRewind)(JNIEnv * env, jobject self,
     err = cppCluster->MediaRewind(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -17969,11 +22921,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSeekResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSeekResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaSeekResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSeekResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSeekResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaSeekResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSeekResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaSeekResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -17983,38 +22937,46 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSeek)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaSeek(onSuccess->Cancel(), onFailure->Cancel(), position);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
+JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaSkipBackwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18024,38 +22986,46 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipBackward)(JNIEnv * env, jobject
     err = cppCluster->MediaSkipBackward(onSuccess->Cancel(), onFailure->Cancel(), deltaPositionMilliseconds);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
+JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong deltaPositionMilliseconds)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaSkipForwardResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18065,24 +23035,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaSkipForward)(JNIEnv * env, jobject s
     err = cppCluster->MediaSkipForward(onSuccess->Cancel(), onFailure->Cancel(), deltaPositionMilliseconds);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -18092,11 +23067,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaStartOverResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaStartOverResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaStartOverResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaStartOverResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaStartOverResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18106,24 +23083,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStartOver)(JNIEnv * env, jobject sel
     err = cppCluster->MediaStartOver(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -18133,11 +23115,13 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPMediaPlaybackClusterMediaStopResponseCallback, void (*)(CHIPMediaPlaybackClusterMediaStopResponseCallback *)> onSuccess(
-        Platform::New<CHIPMediaPlaybackClusterMediaStopResponseCallback>(callback), Platform::Delete<CHIPMediaPlaybackClusterMediaStopResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPMediaPlaybackClusterMediaStopResponseCallback,
+                    void (*)(CHIPMediaPlaybackClusterMediaStopResponseCallback *)>
+        onSuccess(Platform::New<CHIPMediaPlaybackClusterMediaStopResponseCallback>(callback),
+                  Platform::Delete<CHIPMediaPlaybackClusterMediaStopResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18147,24 +23131,29 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
     err = cppCluster->MediaStop(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -18173,15 +23162,20 @@ JNI_METHOD(void, MediaPlaybackCluster, mediaStop)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePlaybackState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18193,15 +23187,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackStateAttribute)(JNIEnv * env,
 JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18213,15 +23212,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readStartTimeAttribute)(JNIEnv * env, job
 JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDuration(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18230,18 +23234,24 @@ JNI_METHOD(void, MediaPlaybackCluster, readDurationAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePositionUpdatedAt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18253,15 +23263,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionUpdatedAtAttribute)(JNIEnv *
 JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18273,15 +23288,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readPositionAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePlaybackSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18293,15 +23313,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readPlaybackSpeedAttribute)(JNIEnv * env,
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSeekRangeEnd(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18313,15 +23338,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeEndAttribute)(JNIEnv * env,
 JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSeekRangeStart(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18333,15 +23363,20 @@ JNI_METHOD(void, MediaPlaybackCluster, readSeekRangeStartAttribute)(JNIEnv * env
 JNI_METHOD(void, MediaPlaybackCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                    = CHIP_NO_ERROR;
     MediaPlaybackCluster * cppCluster = reinterpret_cast<MediaPlaybackCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18358,184 +23393,231 @@ JNI_METHOD(jlong, NetworkCommissioningCluster, initWithDevice)(JNIEnv * env, job
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, addThreadNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, addThreadNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray operationalDatasetArr(env, operationalDataset);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->AddThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(),
+                                       chip::ByteSpan((const uint8_t *) operationalDatasetArr.data(), operationalDatasetArr.size()),
+                                       breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, addWiFiNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
+ jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray ssidArr(env, ssid);
     JniByteArray credentialsArr(env, credentials);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddWiFiNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), chip::ByteSpan((const uint8_t*) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->AddWiFiNetwork(
+        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()),
+        chip::ByteSpan((const uint8_t *) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, disableNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->DisableNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->DisableNetwork(onSuccess->Cancel(), onFailure->Cancel(),
+                                     chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
+                                     timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, enableNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->EnableNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->EnableNetwork(onSuccess->Cancel(), onFailure->Cancel(),
+                                    chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
+                                    timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -18545,210 +23627,265 @@ JNI_METHOD(void, NetworkCommissioningCluster, getLastNetworkCommissioningResult)
     err = cppCluster->GetLastNetworkCommissioningResult(onSuccess->Cancel(), onFailure->Cancel(), timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, removeNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray networkID, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray networkIDArr(env, networkID);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RemoveNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) networkIDArr.data(), networkIDArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->RemoveNetwork(onSuccess->Cancel(), onFailure->Cancel(),
+                                    chip::ByteSpan((const uint8_t *) networkIDArr.data(), networkIDArr.size()), breadcrumb,
+                                    timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, scanNetworks)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray ssidArr(env, ssid);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback, void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterScanNetworksResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterScanNetworksResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterScanNetworksResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->ScanNetworks(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->ScanNetworks(onSuccess->Cancel(), onFailure->Cancel(),
+                                   chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, updateThreadNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, updateThreadNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray operationalDataset, jlong breadcrumb, jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray operationalDatasetArr(env, operationalDataset);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateThreadNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->UpdateThreadNetwork(
+        onSuccess->Cancel(), onFailure->Cancel(),
+        chip::ByteSpan((const uint8_t *) operationalDatasetArr.data(), operationalDatasetArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb, jlong timeoutMs)
+JNI_METHOD(void, NetworkCommissioningCluster, updateWiFiNetwork)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray ssid, jbyteArray credentials, jlong breadcrumb,
+ jlong timeoutMs)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster;
-    
+
     JniByteArray ssidArr(env, ssid);
     JniByteArray credentialsArr(env, credentials);
 
-    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback, void (*)(CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *)> onSuccess(
-        Platform::New<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(callback), Platform::Delete<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback,
+                    void (*)(CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *)>
+        onSuccess(Platform::New<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>(callback),
+                  Platform::Delete<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateWiFiNetwork(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) ssidArr.data(), ssidArr.size()), chip::ByteSpan((const uint8_t*) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
+    err = cppCluster->UpdateWiFiNetwork(
+        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) ssidArr.data(), ssidArr.size()),
+        chip::ByteSpan((const uint8_t *) credentialsArr.data(), credentialsArr.size()), breadcrumb, timeoutMs);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18757,18 +23894,24 @@ JNI_METHOD(void, NetworkCommissioningCluster, readFeatureMapAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, NetworkCommissioningCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                           = CHIP_NO_ERROR;
     NetworkCommissioningCluster * cppCluster = reinterpret_cast<NetworkCommissioningCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18785,107 +23928,134 @@ JNI_METHOD(jlong, OtaSoftwareUpdateProviderCluster, initWithDevice)(JNIEnv * env
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong newVersion)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, applyUpdateRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong newVersion)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-    
+
     JniByteArray updateTokenArr(env, updateToken);
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback, void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *)> onSuccess(
-        Platform::New<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(callback), Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback,
+                    void (*)(CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback *)>
+        onSuccess(Platform::New<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>(callback),
+                  Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterApplyUpdateRequestResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->ApplyUpdateRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) updateTokenArr.data(), updateTokenArr.size()), newVersion);
+    err =
+        cppCluster->ApplyUpdateRequest(onSuccess->Cancel(), onFailure->Cancel(),
+                                       chip::ByteSpan((const uint8_t *) updateTokenArr.data(), updateTokenArr.size()), newVersion);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, notifyUpdateApplied)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong softwareVersion)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, notifyUpdateApplied)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray updateToken, jlong softwareVersion)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-    
+
     JniByteArray updateTokenArr(env, updateToken);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->NotifyUpdateApplied(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) updateTokenArr.data(), updateTokenArr.size()), softwareVersion);
+    err = cppCluster->NotifyUpdateApplied(onSuccess->Cancel(), onFailure->Cancel(),
+                                          chip::ByteSpan((const uint8_t *) updateTokenArr.data(), updateTokenArr.size()),
+                                          softwareVersion);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint vendorId, jint productId, jint hardwareVersion, jlong softwareVersion, jint protocolsSupported, jstring location, jboolean requestorCanConsent, jbyteArray metadataForProvider)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint vendorId, jint productId, jint hardwareVersion,
+ jlong softwareVersion, jint protocolsSupported, jstring location, jboolean requestorCanConsent, jbyteArray metadataForProvider)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster;
-    
+
     JniUtfString locationStr(env, location);
-        JniByteArray metadataForProviderArr(env, metadataForProvider);
+    JniByteArray metadataForProviderArr(env, metadataForProvider);
 
-    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback, void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)> onSuccess(
-        Platform::New<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(callback), Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback,
+                    void (*)(CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *)>
+        onSuccess(Platform::New<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>(callback),
+                  Platform::Delete<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
                                  static_cast<uint8_t>(protocolsSupported),
@@ -18894,43 +24064,63 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)(JNIEnv * env, job
 =======
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
+=======
+    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
+                                 protocolsSupported, chip::ByteSpan((const uint8_t *) location, strlen(locationStr.c_str())),
+                                 requestorCanConsent,
+                                 chip::ByteSpan((const uint8_t *) metadataForProviderArr.data(), metadataForProviderArr.size()));
+>>>>>>> b8d7ee0e3 (callback generation done)
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                = CHIP_NO_ERROR;
     OtaSoftwareUpdateProviderCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -18947,6 +24137,7 @@ JNI_METHOD(jlong, OtaSoftwareUpdateRequestorCluster, initWithDevice)(JNIEnv * en
     return reinterpret_cast<jlong>(cppCluster);
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong providerLocation, jint vendorId, jint announcementReason,
@@ -18954,26 +24145,38 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 =======
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId, jint announcementReason, jbyteArray metadataForNode)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId,
+ jint announcementReason, jbyteArray metadataForNode)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster;
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
     
+=======
+
+>>>>>>> 677ef48a5 (callback generation done)
     JniByteArray providerLocationArr(env, providerLocation);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
     JniByteArray metadataForNodeArr(env, metadataForNode);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), providerLocation,
                                           static_cast<chip::VendorId>(vendorId), static_cast<uint8_t>(announcementReason),
@@ -18981,44 +24184,60 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)(JNIEnv
 =======
     err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) providerLocationArr.data(), providerLocationArr.size()), vendorId, announcementReason, chip::ByteSpan((const uint8_t*) metadataForNodeArr.data(), metadataForNodeArr.size()));
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(),
+                                          chip::ByteSpan((const uint8_t *) providerLocationArr.data(), providerLocationArr.size()),
+                                          vendorId, announcementReason,
+                                          chip::ByteSpan((const uint8_t *) metadataForNodeArr.data(), metadataForNodeArr.size()));
+>>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19027,39 +24246,52 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readDefaultOtaProviderAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, writeDefaultOtaProviderAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeDefaultOtaProvider(onSuccess->Cancel(), onFailure->Cancel(),
+                                                       chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUpdatePossible(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19068,18 +24300,24 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readUpdatePossibleAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                 = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19096,19 +24334,23 @@ JNI_METHOD(jlong, OccupancySensingCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19117,20 +24359,27 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancyAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOccupancy(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                  static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -19140,31 +24389,41 @@ JNI_METHOD(void, OccupancySensingCluster, subscribeOccupancyAttribute)(JNIEnv *
 JNI_METHOD(void, OccupancySensingCluster, reportOccupancyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOccupancy(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancySensorType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19173,18 +24432,24 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupancySensorTypeBitmap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19193,18 +24458,24 @@ JNI_METHOD(void, OccupancySensingCluster, readOccupancySensorTypeBitmapAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OccupancySensingCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                       = CHIP_NO_ERROR;
     OccupancySensingCluster * cppCluster = reinterpret_cast<OccupancySensingCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19226,10 +24497,11 @@ JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19239,37 +24511,44 @@ JNI_METHOD(void, OnOffCluster, off)(JNIEnv * env, jobject self, jlong clusterPtr
     err = cppCluster->Off(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OnOffCluster, offWithEffect)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectId, jint effectVariant)
+JNI_METHOD(void, OnOffCluster, offWithEffect)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint effectId, jint effectVariant)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19280,24 +24559,29 @@ JNI_METHOD(void, OnOffCluster, offWithEffect)(JNIEnv * env, jobject self, jlong
                                     static_cast<uint8_t>(effectVariant));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -19307,10 +24591,11 @@ JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19320,24 +24605,29 @@ JNI_METHOD(void, OnOffCluster, on)(JNIEnv * env, jobject self, jlong clusterPtr,
     err = cppCluster->On(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -19347,10 +24637,11 @@ JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject se
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19360,37 +24651,44 @@ JNI_METHOD(void, OnOffCluster, onWithRecallGlobalScene)(JNIEnv * env, jobject se
     err = cppCluster->OnWithRecallGlobalScene(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OnOffCluster, onWithTimedOff)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint onOffControl, jint onTime, jint offWaitTime)
+JNI_METHOD(void, OnOffCluster, onWithTimedOff)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint onOffControl, jint onTime, jint offWaitTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19400,24 +24698,29 @@ JNI_METHOD(void, OnOffCluster, onWithTimedOff)(JNIEnv * env, jobject self, jlong
     err = cppCluster->OnWithTimedOff(onSuccess->Cancel(), onFailure->Cancel(), onOffControl, onTime, offWaitTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -19427,10 +24730,11 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OnOffCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19440,24 +24744,29 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
     err = cppCluster->Toggle(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -19466,15 +24775,20 @@ JNI_METHOD(void, OnOffCluster, toggle)(JNIEnv * env, jobject self, jlong cluster
 JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19483,20 +24797,27 @@ JNI_METHOD(void, OnOffCluster, readOnOffAttribute)(JNIEnv * env, jobject self, j
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                              static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -19506,15 +24827,19 @@ JNI_METHOD(void, OnOffCluster, subscribeOnOffAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, OnOffCluster, reportOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
+        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOnOff(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -19522,15 +24847,20 @@ JNI_METHOD(void, OnOffCluster, reportOnOffAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeGlobalSceneControl(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19542,15 +24872,20 @@ JNI_METHOD(void, OnOffCluster, readGlobalSceneControlAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19562,18 +24897,23 @@ JNI_METHOD(void, OnOffCluster, readOnTimeAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19582,15 +24922,20 @@ JNI_METHOD(void, OnOffCluster, writeOnTimeAttribute)(JNIEnv * env, jobject self,
 JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOffWaitTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19599,21 +24944,27 @@ JNI_METHOD(void, OnOffCluster, readOffWaitTimeAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOffWaitTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19622,15 +24973,20 @@ JNI_METHOD(void, OnOffCluster, writeOffWaitTimeAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpOnOff(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19639,21 +24995,27 @@ JNI_METHOD(void, OnOffCluster, readStartUpOnOffAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeStartUpOnOff(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -19662,15 +25024,20 @@ JNI_METHOD(void, OnOffCluster, writeStartUpOnOffAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19682,15 +25049,20 @@ JNI_METHOD(void, OnOffCluster, readFeatureMapAttribute)(JNIEnv * env, jobject se
 JNI_METHOD(void, OnOffCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err            = CHIP_NO_ERROR;
     OnOffCluster * cppCluster = reinterpret_cast<OnOffCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19707,19 +25079,24 @@ JNI_METHOD(jlong, OnOffSwitchConfigurationCluster, initWithDevice)(JNIEnv * env,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSwitchType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19728,18 +25105,24 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchTypeAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSwitchActions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19748,38 +25131,50 @@ JNI_METHOD(void, OnOffSwitchConfigurationCluster, readSwitchActionsAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, writeSwitchActionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeSwitchActions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OnOffSwitchConfigurationCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     OnOffSwitchConfigurationCluster * cppCluster = reinterpret_cast<OnOffSwitchConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -19796,143 +25191,179 @@ JNI_METHOD(jlong, OperationalCredentialsCluster, initWithDevice)(JNIEnv * env, j
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, addNOC)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue, jbyteArray IPKValue, jlong caseAdminNode, jint adminVendorId)
+JNI_METHOD(void, OperationalCredentialsCluster, addNOC)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue, jbyteArray IPKValue,
+ jlong caseAdminNode, jint adminVendorId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray NOCValueArr(env, NOCValue);
     JniByteArray ICACValueArr(env, ICACValue);
     JniByteArray IPKValueArr(env, IPKValue);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddNOC(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) NOCValueArr.data(), NOCValueArr.size()), chip::ByteSpan((const uint8_t*) ICACValueArr.data(), ICACValueArr.size()), chip::ByteSpan((const uint8_t*) IPKValueArr.data(), IPKValueArr.size()), caseAdminNode, adminVendorId);
+    err = cppCluster->AddNOC(
+        onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t *) NOCValueArr.data(), NOCValueArr.size()),
+        chip::ByteSpan((const uint8_t *) ICACValueArr.data(), ICACValueArr.size()),
+        chip::ByteSpan((const uint8_t *) IPKValueArr.data(), IPKValueArr.size()), caseAdminNode, adminVendorId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray rootCertificate)
+JNI_METHOD(void, OperationalCredentialsCluster, addTrustedRootCertificate)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray rootCertificate)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray rootCertificateArr(env, rootCertificate);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AddTrustedRootCertificate(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) rootCertificateArr.data(), rootCertificateArr.size()));
+    err = cppCluster->AddTrustedRootCertificate(
+        onSuccess->Cancel(), onFailure->Cancel(),
+        chip::ByteSpan((const uint8_t *) rootCertificateArr.data(), rootCertificateArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray attestationNonce)
+JNI_METHOD(void, OperationalCredentialsCluster, attestationRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray attestationNonce)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray attestationNonceArr(env, attestationNonce);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback, void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterAttestationResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterAttestationResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterAttestationResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterAttestationResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterAttestationResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->AttestationRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) attestationNonceArr.data(), attestationNonceArr.size()));
+    err = cppCluster->AttestationRequest(onSuccess->Cancel(), onFailure->Cancel(),
+                                         chip::ByteSpan((const uint8_t *) attestationNonceArr.data(), attestationNonceArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint certificateType)
+JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint certificateType)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback, void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterCertificateChainResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterCertificateChainResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterCertificateChainResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -19942,80 +25373,98 @@ JNI_METHOD(void, OperationalCredentialsCluster, certificateChainRequest)(JNIEnv
     err = cppCluster->CertificateChainRequest(onSuccess->Cancel(), onFailure->Cancel(), certificateType);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray CSRNonce)
+JNI_METHOD(void, OperationalCredentialsCluster, opCSRRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray CSRNonce)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray CSRNonceArr(env, CSRNonce);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterOpCSRResponseCallback, void (*)(CHIPOperationalCredentialsClusterOpCSRResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterOpCSRResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterOpCSRResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterOpCSRResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterOpCSRResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterOpCSRResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterOpCSRResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->OpCSRRequest(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) CSRNonceArr.data(), CSRNonceArr.size()));
+    err = cppCluster->OpCSRRequest(onSuccess->Cancel(), onFailure->Cancel(),
+                                   chip::ByteSpan((const uint8_t *) CSRNonceArr.data(), CSRNonceArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint fabricIndex)
+JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint fabricIndex)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20025,168 +25474,215 @@ JNI_METHOD(void, OperationalCredentialsCluster, removeFabric)(JNIEnv * env, jobj
     err = cppCluster->RemoveFabric(onSuccess->Cancel(), onFailure->Cancel(), fabricIndex);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray trustedRootIdentifier)
+JNI_METHOD(void, OperationalCredentialsCluster, removeTrustedRootCertificate)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray trustedRootIdentifier)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray trustedRootIdentifierArr(env, trustedRootIdentifier);
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->RemoveTrustedRootCertificate(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) trustedRootIdentifierArr.data(), trustedRootIdentifierArr.size()));
+    err = cppCluster->RemoveTrustedRootCertificate(
+        onSuccess->Cancel(), onFailure->Cancel(),
+        chip::ByteSpan((const uint8_t *) trustedRootIdentifierArr.data(), trustedRootIdentifierArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring label)
+JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring label)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniUtfString labelStr(env, label);
-    
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(labelStr.c_str(), strlen(labelStr.c_str())));
+=======
+    err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(),
+                                        chip::ByteSpan((const uint8_t *) label, strlen(labelStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue)
+JNI_METHOD(void, OperationalCredentialsCluster, updateNOC)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray NOCValue, jbyteArray ICACValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster;
-    
+
     JniByteArray NOCValueArr(env, NOCValue);
     JniByteArray ICACValueArr(env, ICACValue);
 
-    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback, void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback), Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPOperationalCredentialsClusterNOCResponseCallback,
+                    void (*)(CHIPOperationalCredentialsClusterNOCResponseCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsClusterNOCResponseCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsClusterNOCResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->UpdateNOC(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) NOCValueArr.data(), NOCValueArr.size()), chip::ByteSpan((const uint8_t*) ICACValueArr.data(), ICACValueArr.size()));
+    err = cppCluster->UpdateNOC(onSuccess->Cancel(), onFailure->Cancel(),
+                                chip::ByteSpan((const uint8_t *) NOCValueArr.data(), NOCValueArr.size()),
+                                chip::ByteSpan((const uint8_t *) ICACValueArr.data(), ICACValueArr.size()));
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback, void (*)(CHIPOperationalCredentialsFabricsListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPOperationalCredentialsFabricsListAttributeCallback>(callback), Platform::Delete<CHIPOperationalCredentialsFabricsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback,
+                    void (*)(CHIPOperationalCredentialsFabricsListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPOperationalCredentialsFabricsListAttributeCallback>(callback),
+                  Platform::Delete<CHIPOperationalCredentialsFabricsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFabricsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20195,18 +25691,24 @@ JNI_METHOD(void, OperationalCredentialsCluster, readFabricsListAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSupportedFabrics(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20215,18 +25717,24 @@ JNI_METHOD(void, OperationalCredentialsCluster, readSupportedFabricsAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCommissionedFabrics(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20235,6 +25743,7 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute
     onFailure.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, OperationalCredentialsCluster, readTrustedRootCertificatesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
@@ -20295,17 +25804,26 @@ JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
 =======
 JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     OperationalCredentialsCluster * cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20322,19 +25840,23 @@ JNI_METHOD(jlong, PowerSourceCluster, initWithDevice)(JNIEnv * env, jobject self
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20346,15 +25868,20 @@ JNI_METHOD(void, PowerSourceCluster, readStatusAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOrder(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20366,16 +25893,20 @@ JNI_METHOD(void, PowerSourceCluster, readOrderAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDescription(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20387,15 +25918,20 @@ JNI_METHOD(void, PowerSourceCluster, readDescriptionAttribute)(JNIEnv * env, job
 JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryVoltage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20404,18 +25940,24 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryVoltageAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryPercentRemaining(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20424,18 +25966,24 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryPercentRemainingAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryTimeRemaining(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20444,18 +25992,24 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryTimeRemainingAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryChargeLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20464,19 +26018,26 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeLevelAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback, void (*)(CHIPPowerSourceActiveBatteryFaultsAttributeCallback *)> onSuccess(
-        Platform::New<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback), Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback,
+                    void (*)(CHIPPowerSourceActiveBatteryFaultsAttributeCallback *)>
+        onSuccess(Platform::New<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>(callback),
+                  Platform::Delete<CHIPPowerSourceActiveBatteryFaultsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveBatteryFaults(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20485,18 +26046,24 @@ JNI_METHOD(void, PowerSourceCluster, readActiveBatteryFaultsAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBatteryChargeState(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20508,15 +26075,20 @@ JNI_METHOD(void, PowerSourceCluster, readBatteryChargeStateAttribute)(JNIEnv * e
 JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20528,15 +26100,20 @@ JNI_METHOD(void, PowerSourceCluster, readFeatureMapAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, PowerSourceCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     PowerSourceCluster * cppCluster = reinterpret_cast<PowerSourceCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20553,19 +26130,24 @@ JNI_METHOD(jlong, PressureMeasurementCluster, initWithDevice)(JNIEnv * env, jobj
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20574,54 +26156,72 @@ JNI_METHOD(void, PressureMeasurementCluster, readMeasuredValueAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PressureMeasurementCluster, subscribeMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                      static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, reportMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20630,18 +26230,24 @@ JNI_METHOD(void, PressureMeasurementCluster, readMinMeasuredValueAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20650,18 +26256,24 @@ JNI_METHOD(void, PressureMeasurementCluster, readMaxMeasuredValueAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PressureMeasurementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     PressureMeasurementCluster * cppCluster = reinterpret_cast<PressureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20678,19 +26290,24 @@ JNI_METHOD(jlong, PumpConfigurationAndControlCluster, initWithDevice)(JNIEnv * e
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20699,18 +26316,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxPressureAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20719,18 +26342,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxSpeedAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -20739,6 +26368,7 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)(JNIEn
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -20996,17 +26626,26 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, reportPumpStatusAttribute)(
 }
 
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEffectiveOperationMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21015,18 +26654,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeA
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEffectiveControlMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21035,18 +26680,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveControlModeAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21055,42 +26706,55 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readCapacityAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribeCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribeCapacityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCapacity(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                 static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, reportCapacityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, reportCapacityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCapacity(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -21132,17 +26796,26 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedA
 }
 
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21151,26 +26824,33 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOperationMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
+<<<<<<< HEAD
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -21252,17 +26932,26 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)(JN
 }
 
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+=======
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
-
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21279,19 +26968,24 @@ JNI_METHOD(jlong, RelativeHumidityMeasurementCluster, initWithDevice)(JNIEnv * e
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21300,54 +26994,72 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMeasuredValueAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, subscribeMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                      static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21356,18 +27068,24 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMinMeasuredValueAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21376,6 +27094,7 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribu
     onFailure.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
@@ -21456,17 +27175,26 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribut
 =======
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     RelativeHumidityMeasurementCluster * cppCluster = reinterpret_cast<RelativeHumidityMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21483,44 +27211,58 @@ JNI_METHOD(jlong, ScenesCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, ScenesCluster, addScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName, jlong clusterId, jint length, jint value)
+JNI_METHOD(void, ScenesCluster, addScene)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime, jstring sceneName,
+ jlong clusterId, jint length, jint value)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
+
     JniUtfString sceneNameStr(env, sceneName);
-    
+
     std::unique_ptr<CHIPScenesClusterAddSceneResponseCallback, void (*)(CHIPScenesClusterAddSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterAddSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterAddSceneResponseCallback>(callback),
+        Platform::Delete<CHIPScenesClusterAddSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime, chip::CharSpan(sceneNameStr.c_str(), strlen(sceneNameStr.c_str())), clusterId, length, value);
+=======
+    err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime,
+                               chip::ByteSpan((const uint8_t *) sceneName, strlen(sceneNameStr.c_str())), clusterId, length, value);
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -21530,11 +27272,13 @@ JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback, void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterGetSceneMembershipResponseCallback>(callback), Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterGetSceneMembershipResponseCallback,
+                    void (*)(CHIPScenesClusterGetSceneMembershipResponseCallback *)>
+        onSuccess(Platform::New<CHIPScenesClusterGetSceneMembershipResponseCallback>(callback),
+                  Platform::Delete<CHIPScenesClusterGetSceneMembershipResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21544,37 +27288,44 @@ JNI_METHOD(void, ScenesCluster, getSceneMembership)(JNIEnv * env, jobject self,
     err = cppCluster->GetSceneMembership(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, recallScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime)
+JNI_METHOD(void, ScenesCluster, recallScene)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21584,24 +27335,29 @@ JNI_METHOD(void, ScenesCluster, recallScene)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->RecallScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -21611,11 +27367,12 @@ JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlo
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterRemoveAllScenesResponseCallback>(callback), Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterRemoveAllScenesResponseCallback, void (*)(CHIPScenesClusterRemoveAllScenesResponseCallback *)>
+        onSuccess(Platform::New<CHIPScenesClusterRemoveAllScenesResponseCallback>(callback),
+                  Platform::Delete<CHIPScenesClusterRemoveAllScenesResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21625,38 +27382,45 @@ JNI_METHOD(void, ScenesCluster, removeAllScenes)(JNIEnv * env, jobject self, jlo
     err = cppCluster->RemoveAllScenes(onSuccess->Cancel(), onFailure->Cancel(), groupId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, removeScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, removeScene)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterRemoveSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPScenesClusterRemoveSceneResponseCallback, void (*)(CHIPScenesClusterRemoveSceneResponseCallback *)>
+        onSuccess(Platform::New<CHIPScenesClusterRemoveSceneResponseCallback>(callback),
+                  Platform::Delete<CHIPScenesClusterRemoveSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21666,38 +27430,45 @@ JNI_METHOD(void, ScenesCluster, removeScene)(JNIEnv * env, jobject self, jlong c
     err = cppCluster->RemoveScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, storeScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, storeScene)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPScenesClusterStoreSceneResponseCallback, void (*)(CHIPScenesClusterStoreSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterStoreSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterStoreSceneResponseCallback>(callback),
+        Platform::Delete<CHIPScenesClusterStoreSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21707,38 +27478,45 @@ JNI_METHOD(void, ScenesCluster, storeScene)(JNIEnv * env, jobject self, jlong cl
     err = cppCluster->StoreScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ScenesCluster, viewScene)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
+JNI_METHOD(void, ScenesCluster, viewScene)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint groupId, jint sceneId)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ScenesCluster * cppCluster;
-    
 
     std::unique_ptr<CHIPScenesClusterViewSceneResponseCallback, void (*)(CHIPScenesClusterViewSceneResponseCallback *)> onSuccess(
-        Platform::New<CHIPScenesClusterViewSceneResponseCallback>(callback), Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+        Platform::New<CHIPScenesClusterViewSceneResponseCallback>(callback),
+        Platform::Delete<CHIPScenesClusterViewSceneResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21748,24 +27526,29 @@ JNI_METHOD(void, ScenesCluster, viewScene)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->ViewScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -21774,15 +27557,20 @@ JNI_METHOD(void, ScenesCluster, viewScene)(JNIEnv * env, jobject self, jlong clu
 JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSceneCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21794,15 +27582,20 @@ JNI_METHOD(void, ScenesCluster, readSceneCountAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentScene(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21814,15 +27607,20 @@ JNI_METHOD(void, ScenesCluster, readCurrentSceneAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentGroup(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21834,15 +27632,20 @@ JNI_METHOD(void, ScenesCluster, readCurrentGroupAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSceneValid(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21854,15 +27657,20 @@ JNI_METHOD(void, ScenesCluster, readSceneValidAttribute)(JNIEnv * env, jobject s
 JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNameSupport(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21874,15 +27682,20 @@ JNI_METHOD(void, ScenesCluster, readNameSupportAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, ScenesCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     ScenesCluster * cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21904,10 +27717,11 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobj
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -21917,41 +27731,52 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, resetWatermarks)(JNIEnv * env, jobj
     err = cppCluster->ResetWatermarks(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapFree(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21960,18 +27785,24 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapFreeAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapUsed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21980,18 +27811,24 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapUsedAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentHeapHighWatermark(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22000,18 +27837,24 @@ JNI_METHOD(void, SoftwareDiagnosticsCluster, readCurrentHeapHighWatermarkAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, SoftwareDiagnosticsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                          = CHIP_NO_ERROR;
     SoftwareDiagnosticsCluster * cppCluster = reinterpret_cast<SoftwareDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22028,19 +27871,23 @@ JNI_METHOD(jlong, SwitchCluster, initWithDevice)(JNIEnv * env, jobject self, jlo
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfPositions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22052,15 +27899,20 @@ JNI_METHOD(void, SwitchCluster, readNumberOfPositionsAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22069,20 +27921,27 @@ JNI_METHOD(void, SwitchCluster, readCurrentPositionAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPosition(onSuccess->Cancel(), onFailure->Cancel(),
+                                                        static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -22092,15 +27951,19 @@ JNI_METHOD(void, SwitchCluster, subscribeCurrentPositionAttribute)(JNIEnv * env,
 JNI_METHOD(void, SwitchCluster, reportCurrentPositionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPosition(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -22108,15 +27971,20 @@ JNI_METHOD(void, SwitchCluster, reportCurrentPositionAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, SwitchCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err             = CHIP_NO_ERROR;
     SwitchCluster * cppCluster = reinterpret_cast<SwitchCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22138,52 +28006,67 @@ JNI_METHOD(void, TvChannelCluster, changeChannel)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
-    
+
     JniUtfString matchStr(env, match);
-    
-    std::unique_ptr<CHIPTvChannelClusterChangeChannelResponseCallback, void (*)(CHIPTvChannelClusterChangeChannelResponseCallback *)> onSuccess(
-        Platform::New<CHIPTvChannelClusterChangeChannelResponseCallback>(callback), Platform::Delete<CHIPTvChannelClusterChangeChannelResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPTvChannelClusterChangeChannelResponseCallback,
+                    void (*)(CHIPTvChannelClusterChangeChannelResponseCallback *)>
+        onSuccess(Platform::New<CHIPTvChannelClusterChangeChannelResponseCallback>(callback),
+                  Platform::Delete<CHIPTvChannelClusterChangeChannelResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(matchStr.c_str(), strlen(matchStr.c_str())));
+=======
+    err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(),
+                                    chip::ByteSpan((const uint8_t *) match, strlen(matchStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint majorNumber, jint minorNumber)
+JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint majorNumber, jint minorNumber)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22193,24 +28076,29 @@ JNI_METHOD(void, TvChannelCluster, changeChannelByNumber)(JNIEnv * env, jobject
     err = cppCluster->ChangeChannelByNumber(onSuccess->Cancel(), onFailure->Cancel(), majorNumber, minorNumber);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -22220,10 +28108,11 @@ JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlon
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22233,24 +28122,29 @@ JNI_METHOD(void, TvChannelCluster, skipChannel)(JNIEnv * env, jobject self, jlon
     err = cppCluster->SkipChannel(onSuccess->Cancel(), onFailure->Cancel(), count);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -22260,15 +28154,20 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, job
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback, void (*)(CHIPTvChannelTvChannelListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTvChannelTvChannelListAttributeCallback>(callback), Platform::Delete<CHIPTvChannelTvChannelListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPTvChannelTvChannelListAttributeCallback>(callback),
+        Platform::Delete<CHIPTvChannelTvChannelListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTvChannelList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22280,16 +28179,20 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelListAttribute)(JNIEnv * env, job
 JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTvChannelLineup(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22301,16 +28204,20 @@ JNI_METHOD(void, TvChannelCluster, readTvChannelLineupAttribute)(JNIEnv * env, j
 JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentTvChannel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22322,15 +28229,20 @@ JNI_METHOD(void, TvChannelCluster, readCurrentTvChannelAttribute)(JNIEnv * env,
 JNI_METHOD(void, TvChannelCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     TvChannelCluster * cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22347,62 +28259,83 @@ JNI_METHOD(jlong, TargetNavigatorCluster, initWithDevice)(JNIEnv * env, jobject
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint target, jstring data)
+JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint target, jstring data)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster;
-    
+
     JniUtfString dataStr(env, data);
-    
-    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback, void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)> onSuccess(
-        Platform::New<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>(callback), Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPTargetNavigatorClusterNavigateTargetResponseCallback,
+                    void (*)(CHIPTargetNavigatorClusterNavigateTargetResponseCallback *)>
+        onSuccess(Platform::New<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>(callback),
+                  Platform::Delete<CHIPTargetNavigatorClusterNavigateTargetResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
     err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
+=======
+    err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target,
+                                     chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback, void (*)(CHIPTargetNavigatorTargetNavigatorListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>(callback), Platform::Delete<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback,
+                    void (*)(CHIPTargetNavigatorTargetNavigatorListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>(callback),
+                  Platform::Delete<CHIPTargetNavigatorTargetNavigatorListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetNavigatorList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22411,18 +28344,24 @@ JNI_METHOD(void, TargetNavigatorCluster, readTargetNavigatorListAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TargetNavigatorCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                      = CHIP_NO_ERROR;
     TargetNavigatorCluster * cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22439,19 +28378,24 @@ JNI_METHOD(jlong, TemperatureMeasurementCluster, initWithDevice)(JNIEnv * env, j
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22460,54 +28404,72 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMeasuredValueAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, subscribeMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, TemperatureMeasurementCluster, subscribeMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeMeasuredValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                      static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, reportMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, reportMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeMeasuredValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22516,18 +28478,24 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMinMeasuredValueAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxMeasuredValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22536,6 +28504,7 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)(J
     onFailure.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, TemperatureMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
@@ -22616,17 +28585,26 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
 =======
 JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     TemperatureMeasurementCluster * cppCluster = reinterpret_cast<TemperatureMeasurementCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22648,10 +28626,11 @@ JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clu
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22661,38 +28640,46 @@ JNI_METHOD(void, TestClusterCluster, test)(JNIEnv * env, jobject self, jlong clu
     err = cppCluster->Test(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testAddArguments)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
+JNI_METHOD(void, TestClusterCluster, testAddArguments)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback, void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterClusterTestAddArgumentsResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestAddArgumentsResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestAddArgumentsResponseCallback *)>
+        onSuccess(Platform::New<CHIPTestClusterClusterTestAddArgumentsResponseCallback>(callback),
+                  Platform::Delete<CHIPTestClusterClusterTestAddArgumentsResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22702,24 +28689,29 @@ JNI_METHOD(void, TestClusterCluster, testAddArguments)(JNIEnv * env, jobject sel
     err = cppCluster->TestAddArguments(onSuccess->Cancel(), onFailure->Cancel(), arg1, arg2);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -22912,10 +28904,11 @@ JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -22925,24 +28918,29 @@ JNI_METHOD(void, TestClusterCluster, testNotHandled)(JNIEnv * env, jobject self,
     err = cppCluster->TestNotHandled(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -23001,11 +28999,13 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback, void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterClusterTestSpecificResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestSpecificResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestSpecificResponseCallback *)>
+        onSuccess(Platform::New<CHIPTestClusterClusterTestSpecificResponseCallback>(callback),
+                  Platform::Delete<CHIPTestClusterClusterTestSpecificResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -23015,24 +29015,29 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
     err = cppCluster->TestSpecific(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -23090,10 +29095,11 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -23103,24 +29109,29 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
     err = cppCluster->TestUnknownCommand(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -23129,15 +29140,20 @@ JNI_METHOD(void, TestClusterCluster, testUnknownCommand)(JNIEnv * env, jobject s
 JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBoolean(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23146,21 +29162,27 @@ JNI_METHOD(void, TestClusterCluster, readBooleanAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBoolean(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23169,15 +29191,20 @@ JNI_METHOD(void, TestClusterCluster, writeBooleanAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap8(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23186,21 +29213,27 @@ JNI_METHOD(void, TestClusterCluster, readBitmap8Attribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap8(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23209,15 +29242,20 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap8Attribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap16(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23226,21 +29264,27 @@ JNI_METHOD(void, TestClusterCluster, readBitmap16Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap16(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23249,15 +29293,20 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap16Attribute)(JNIEnv * env, jobje
 JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap32(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23266,21 +29315,27 @@ JNI_METHOD(void, TestClusterCluster, readBitmap32Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap32(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23289,15 +29344,20 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap32Attribute)(JNIEnv * env, jobje
 JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBitmap64(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23306,21 +29366,27 @@ JNI_METHOD(void, TestClusterCluster, readBitmap64Attribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeBitmap64(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23329,15 +29395,20 @@ JNI_METHOD(void, TestClusterCluster, writeBitmap64Attribute)(JNIEnv * env, jobje
 JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt8u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23346,21 +29417,27 @@ JNI_METHOD(void, TestClusterCluster, readInt8uAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt8u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23369,15 +29446,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt8uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt16u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23386,21 +29468,27 @@ JNI_METHOD(void, TestClusterCluster, readInt16uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt16u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23409,15 +29497,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt16uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt32u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23426,21 +29519,27 @@ JNI_METHOD(void, TestClusterCluster, readInt32uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt32u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23449,15 +29548,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt32uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt64u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23466,21 +29570,27 @@ JNI_METHOD(void, TestClusterCluster, readInt64uAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt64u(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23489,15 +29599,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt64uAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt8s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23506,21 +29621,27 @@ JNI_METHOD(void, TestClusterCluster, readInt8sAttribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt8s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23529,15 +29650,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt8sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt16s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23546,21 +29672,27 @@ JNI_METHOD(void, TestClusterCluster, readInt16sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt16s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23569,15 +29701,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt16sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32sAttributeCallback, void (*)(CHIPInt32sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32sAttributeCallback>(callback), Platform::Delete<CHIPInt32sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt32s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23586,21 +29723,27 @@ JNI_METHOD(void, TestClusterCluster, readInt32sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt32s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int32_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23609,15 +29752,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt32sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64sAttributeCallback, void (*)(CHIPInt64sAttributeCallback *)> onSuccess(Platform::New<CHIPInt64sAttributeCallback>(callback), Platform::Delete<CHIPInt64sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64sAttributeCallback, void (*)(CHIPInt64sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64sAttributeCallback>(callback), Platform::Delete<CHIPInt64sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInt64s(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23626,21 +29774,27 @@ JNI_METHOD(void, TestClusterCluster, readInt64sAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeInt64s(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int64_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23649,15 +29803,20 @@ JNI_METHOD(void, TestClusterCluster, writeInt64sAttribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnum8(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23666,21 +29825,27 @@ JNI_METHOD(void, TestClusterCluster, readEnum8Attribute)(JNIEnv * env, jobject s
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEnum8(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23689,15 +29854,20 @@ JNI_METHOD(void, TestClusterCluster, writeEnum8Attribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEnum16(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23706,21 +29876,27 @@ JNI_METHOD(void, TestClusterCluster, readEnum16Attribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEnum16(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -23729,16 +29905,20 @@ JNI_METHOD(void, TestClusterCluster, writeEnum16Attribute)(JNIEnv * env, jobject
 JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23747,21 +29927,28 @@ JNI_METHOD(void, TestClusterCluster, readOctetStringAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, TestClusterCluster, writeOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeOctetString(onSuccess->Cancel(), onFailure->Cancel(),
+                                                chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -23772,15 +29959,20 @@ JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobje
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback, void (*)(CHIPTestClusterListInt8uAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterListInt8uAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+        Platform::New<CHIPTestClusterListInt8uAttributeCallback>(callback),
+        Platform::Delete<CHIPTestClusterListInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListInt8u(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23792,16 +29984,21 @@ JNI_METHOD(void, TestClusterCluster, readListInt8uAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, void (*)(CHIPTestClusterListOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterListOctetStringAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback, void (*)(CHIPTestClusterListOctetStringAttributeCallback *)>
+        onSuccess(Platform::New<CHIPTestClusterListOctetStringAttributeCallback>(callback),
+                  Platform::Delete<CHIPTestClusterListOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23810,19 +30007,26 @@ JNI_METHOD(void, TestClusterCluster, readListOctetStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback, void (*)(CHIPTestClusterListStructOctetStringAttributeCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterListStructOctetStringAttributeCallback>(callback), Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback,
+                    void (*)(CHIPTestClusterListStructOctetStringAttributeCallback *)>
+        onSuccess(Platform::New<CHIPTestClusterListStructOctetStringAttributeCallback>(callback),
+                  Platform::Delete<CHIPTestClusterListStructOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeListStructOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23834,16 +30038,20 @@ JNI_METHOD(void, TestClusterCluster, readListStructOctetStringAttribute)(JNIEnv
 JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23852,21 +30060,28 @@ JNI_METHOD(void, TestClusterCluster, readLongOctetStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
+JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniByteArray jniArr(env, value);
-    err = cppCluster->WriteAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) jniArr.data(), jniArr.size()));
+    err = cppCluster->WriteAttributeLongOctetString(onSuccess->Cancel(), onFailure->Cancel(),
+                                                    chip::ByteSpan((const uint8_t *) jniArr.data(), jniArr.size()));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -23876,16 +30091,20 @@ JNI_METHOD(void, TestClusterCluster, writeLongOctetStringAttribute)(JNIEnv * env
 JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCharString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23894,21 +30113,32 @@ JNI_METHOD(void, TestClusterCluster, readCharStringAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
+<<<<<<< HEAD
     err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+=======
+    err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(),
+                                               chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -23918,16 +30148,20 @@ JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)(JNIEnv * env, job
 JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23936,21 +30170,32 @@ JNI_METHOD(void, TestClusterCluster, readLongCharStringAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
+JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jstring value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
+<<<<<<< HEAD
     err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
+=======
+    err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(),
+                                                   chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
+>>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -23960,15 +30205,20 @@ JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)(JNIEnv * env,
 JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEpochUs(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -23977,21 +30227,27 @@ JNI_METHOD(void, TestClusterCluster, readEpochUsAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEpochUs(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint64_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -24000,15 +30256,20 @@ JNI_METHOD(void, TestClusterCluster, writeEpochUsAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEpochS(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24017,21 +30278,27 @@ JNI_METHOD(void, TestClusterCluster, readEpochSAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
+JNI_METHOD(void, TestClusterCluster, writeEpochSAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeEpochS(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint32_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -24091,15 +30358,20 @@ JNI_METHOD(void, TestClusterCluster, writeVendorIdAttribute)
 JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeUnsupported(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24108,21 +30380,27 @@ JNI_METHOD(void, TestClusterCluster, readUnsupportedAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
+JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jboolean value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeUnsupported(onSuccess->Cancel(), onFailure->Cancel(), static_cast<bool>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -24131,15 +30409,20 @@ JNI_METHOD(void, TestClusterCluster, writeUnsupportedAttribute)(JNIEnv * env, jo
 JNI_METHOD(void, TestClusterCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                  = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24161,10 +30444,11 @@ JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject s
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24174,24 +30458,29 @@ JNI_METHOD(void, ThermostatCluster, clearWeeklySchedule)(JNIEnv * env, jobject s
     err = cppCluster->ClearWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -24201,10 +30490,11 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24214,37 +30504,44 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel
     err = cppCluster->GetRelayStatusLog(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint daysToReturn, jint modeToReturn)
+JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint daysToReturn, jint modeToReturn)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24254,77 +30551,93 @@ JNI_METHOD(void, ThermostatCluster, getWeeklySchedule)(JNIEnv * env, jobject sel
     err = cppCluster->GetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), daysToReturn, modeToReturn);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint numberOfTransitionsForSequence, jint dayOfWeekForSequence, jint modeForSequence, jint payload)
+JNI_METHOD(void, ThermostatCluster, setWeeklySchedule)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint numberOfTransitionsForSequence, jint dayOfWeekForSequence,
+ jint modeForSequence, jint payload)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-    err = cppCluster->SetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, payload);
+    err = cppCluster->SetWeeklySchedule(onSuccess->Cancel(), onFailure->Cancel(), numberOfTransitionsForSequence,
+                                        dayOfWeekForSequence, modeForSequence, payload);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint mode, jint amount)
+JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint mode, jint amount)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -24334,24 +30647,29 @@ JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)(JNIEnv * env, jobject se
     err = cppCluster->SetpointRaiseLower(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(mode), amount);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -24360,15 +30678,20 @@ JNI_METHOD(void, ThermostatCluster, setpointRaiseLower)(JNIEnv * env, jobject se
 JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24377,20 +30700,27 @@ JNI_METHOD(void, ThermostatCluster, readLocalTemperatureAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeLocalTemperature(onSuccess->Cancel(), onFailure->Cancel(),
+                                                         static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -24400,31 +30730,41 @@ JNI_METHOD(void, ThermostatCluster, subscribeLocalTemperatureAttribute)(JNIEnv *
 JNI_METHOD(void, ThermostatCluster, reportLocalTemperatureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16sAttributeCallback>(callback, true), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeLocalTemperature(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24433,18 +30773,24 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinHeatSetpointLimitAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24453,18 +30799,24 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxHeatSetpointLimitAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24473,18 +30825,24 @@ JNI_METHOD(void, ThermostatCluster, readAbsMinCoolSetpointLimitAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAbsMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24493,18 +30851,24 @@ JNI_METHOD(void, ThermostatCluster, readAbsMaxCoolSetpointLimitAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupiedCoolingSetpoint(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24513,38 +30877,50 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedCoolingSetpointAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedCoolingSetpointAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOccupiedCoolingSetpoint(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOccupiedHeatingSetpoint(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24553,38 +30929,50 @@ JNI_METHOD(void, ThermostatCluster, readOccupiedHeatingSetpointAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeOccupiedHeatingSetpointAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOccupiedHeatingSetpoint(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24593,38 +30981,50 @@ JNI_METHOD(void, ThermostatCluster, readMinHeatSetpointLimitAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMinHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMinHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24633,38 +31033,50 @@ JNI_METHOD(void, ThermostatCluster, readMaxHeatSetpointLimitAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMaxHeatSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMaxHeatSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24673,38 +31085,50 @@ JNI_METHOD(void, ThermostatCluster, readMinCoolSetpointLimitAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMinCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMinCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24713,26 +31137,33 @@ JNI_METHOD(void, ThermostatCluster, readMaxCoolSetpointLimitAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMaxCoolSetpointLimit(onSuccess->Cancel(), onFailure->Cancel(), static_cast<int16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, ThermostatCluster, readMinSetpointDeadBandAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
@@ -24791,17 +31222,26 @@ JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
 =======
 JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24810,21 +31250,28 @@ JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->WriteAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err =
+        cppCluster->WriteAttributeControlSequenceOfOperation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -24833,15 +31280,20 @@ JNI_METHOD(void, ThermostatCluster, writeControlSequenceOfOperationAttribute)(JN
 JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSystemMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24850,21 +31302,27 @@ JNI_METHOD(void, ThermostatCluster, readSystemModeAttribute)(JNIEnv * env, jobje
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeSystemMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -24873,15 +31331,20 @@ JNI_METHOD(void, ThermostatCluster, writeSystemModeAttribute)(JNIEnv * env, jobj
 JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartOfWeek(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24890,18 +31353,24 @@ JNI_METHOD(void, ThermostatCluster, readStartOfWeekAttribute)(JNIEnv * env, jobj
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfWeeklyTransitions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24910,18 +31379,24 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfWeeklyTransitionsAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNumberOfDailyTransitions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24932,16 +31407,21 @@ JNI_METHOD(void, ThermostatCluster, readNumberOfDailyTransitionsAttribute)(JNIEn
 
 JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
-    chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    chip::DeviceLayer::StackLock lock;
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24953,15 +31433,20 @@ JNI_METHOD(void, ThermostatCluster, readFeatureMapAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                 = CHIP_NO_ERROR;
     ThermostatCluster * cppCluster = reinterpret_cast<ThermostatCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24969,7 +31454,8 @@ JNI_METHOD(void, ThermostatCluster, readClusterRevisionAttribute)(JNIEnv * env,
     onSuccess.release();
     onFailure.release();
 }
-JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
+JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)
+(JNIEnv * env, jobject self, jlong devicePtr, jint endpointId)
 {
     chip::DeviceLayer::StackLock lock;
     ThermostatUserInterfaceConfigurationCluster * cppCluster = new ThermostatUserInterfaceConfigurationCluster();
@@ -24978,19 +31464,25 @@ JNI_METHOD(jlong, ThermostatUserInterfaceConfigurationCluster, initWithDevice)(J
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDisplayModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDisplayModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTemperatureDisplayMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -24999,38 +31491,52 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readTemperatureDis
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeTemperatureDisplayModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeTemperatureDisplayMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeKeypadLockout(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25039,38 +31545,52 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readKeypadLockoutA
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeKeypadLockoutAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeKeypadLockout(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgrammingVisibilityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgrammingVisibilityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25079,38 +31599,53 @@ JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readScheduleProgra
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, writeScheduleProgrammingVisibilityAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->WriteAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    err = cppCluster->WriteAttributeScheduleProgrammingVisibility(onSuccess->Cancel(), onFailure->Cancel(),
+                                                                  static_cast<uint8_t>(value));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThermostatUserInterfaceConfigurationCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
     CHIP_ERROR err = CHIP_NO_ERROR;
-    ThermostatUserInterfaceConfigurationCluster * cppCluster = reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    ThermostatUserInterfaceConfigurationCluster * cppCluster =
+        reinterpret_cast<ThermostatUserInterfaceConfigurationCluster *>(clusterPtr);
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25132,10 +31667,11 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, job
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -25145,41 +31681,52 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, job
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25188,18 +31735,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRoutingRole(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25208,19 +31761,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRoutingRoleAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNetworkName(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25229,18 +31787,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNetworkNameAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePanId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25249,18 +31813,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPanIdAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeExtendedPanId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25269,19 +31839,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readExtendedPanIdAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMeshLocalPrefix(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25290,18 +31865,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readMeshLocalPrefixAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25310,19 +31891,26 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback,
+                    void (*)(CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>(callback),
+                  Platform::Delete<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeNeighborTableList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25331,19 +31919,26 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readNeighborTableListAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback,
+                    void (*)(CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>(callback),
+                  Platform::Delete<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRouteTableList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25352,18 +31947,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouteTableListAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartitionId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25372,18 +31973,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWeighting(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25392,18 +31999,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readWeightingAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDataVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25412,18 +32025,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDataVersionAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStableDataVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25432,18 +32051,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readStableDataVersionAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLeaderRouterId(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25452,18 +32077,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRouterIdAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDetachedRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25472,18 +32103,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDetachedRoleCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChildRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25492,18 +32129,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChildRoleCountAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRouterRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25512,18 +32155,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRouterRoleCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLeaderRoleCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25532,18 +32181,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readLeaderRoleCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAttachAttemptCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25552,18 +32207,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readAttachAttemptCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePartitionIdChangeCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25572,18 +32233,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPartitionIdChangeCountAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttemptCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttemptCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBetterPartitionAttachAttemptCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25592,18 +32259,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readBetterPartitionAttachAttem
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeParentChangeCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25612,18 +32285,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readParentChangeCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxTotalCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25632,18 +32311,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxTotalCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxUnicastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25652,18 +32337,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxUnicastCountAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBroadcastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25672,18 +32363,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBroadcastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxAckRequestedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25692,18 +32389,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckRequestedCountAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxAckedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25712,18 +32415,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxAckedCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxNoAckRequestedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25732,18 +32441,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxNoAckRequestedCountAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDataCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25752,18 +32467,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataCountAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDataPollCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25772,18 +32493,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDataPollCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBeaconCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25792,18 +32519,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxBeaconRequestCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25812,18 +32545,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxBeaconRequestCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25832,18 +32571,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxOtherCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxRetryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25852,18 +32597,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxRetryCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxDirectMaxRetryExpiryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25872,18 +32623,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxDirectMaxRetryExpiryCoun
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxIndirectMaxRetryExpiryCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25892,18 +32649,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxIndirectMaxRetryExpiryCo
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrCcaCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25912,18 +32675,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrCcaCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrAbortCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25932,18 +32701,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrAbortCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTxErrBusyChannelCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25952,18 +32727,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readTxErrBusyChannelCountAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxTotalCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25972,18 +32753,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxTotalCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxUnicastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -25992,18 +32779,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxUnicastCountAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBroadcastCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26012,18 +32805,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBroadcastCountAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDataCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26032,18 +32831,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataCountAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDataPollCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26052,18 +32857,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDataPollCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBeaconCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26072,18 +32883,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxBeaconRequestCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26092,18 +32909,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxBeaconRequestCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26112,18 +32935,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxOtherCountAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxAddressFilteredCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26132,18 +32961,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxAddressFilteredCountAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDestAddrFilteredCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26152,18 +32987,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDestAddrFilteredCountAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxDuplicatedCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26172,18 +33013,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxDuplicatedCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrNoFrameCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26192,18 +33039,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrNoFrameCountAttribute
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrUnknownNeighborCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26212,18 +33065,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrUnknownNeighborCountA
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrInvalidSrcAddrCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26232,18 +33091,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrInvalidSrcAddrCountAt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrSecCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26252,18 +33117,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrSecCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrFcsCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26272,18 +33143,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrFcsCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRxErrOtherCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26292,18 +33169,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readRxErrOtherCountAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveTimestamp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26312,18 +33195,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveTimestampAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePendingTimestamp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26332,18 +33221,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readPendingTimestampAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDelay(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26352,19 +33247,26 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readDelayAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *)> onSuccess(
-        Platform::New<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback,
+                    void (*)(CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *)>
+        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>(callback),
+                  Platform::Delete<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSecurityPolicy(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26373,19 +33275,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readSecurityPolicyAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannelMask(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26394,19 +33301,26 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readChannelMaskAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponentsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponentsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *)> onSuccess(
-        Platform::New<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback,
+                    void (*)(CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *)>
+        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>(callback),
+                  Platform::Delete<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationalDatasetComponents(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26415,19 +33329,26 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readOperationalDatasetComponen
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback, void (*)(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback), Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback,
+                    void (*)(CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>(callback),
+                  Platform::Delete<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActiveNetworkFaultsList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26436,18 +33357,24 @@ JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readActiveNetworkFaultsListAtt
     onFailure.release();
 }
 
-JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, ThreadNetworkDiagnosticsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                               = CHIP_NO_ERROR;
     ThreadNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<ThreadNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26464,20 +33391,23 @@ JNI_METHOD(jlong, WakeOnLanCluster, initWithDevice)(JNIEnv * env, jobject self,
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     WakeOnLanCluster * cppCluster = reinterpret_cast<WakeOnLanCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWakeOnLanMacAddress(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26489,15 +33419,20 @@ JNI_METHOD(void, WakeOnLanCluster, readWakeOnLanMacAddressAttribute)(JNIEnv * en
 JNI_METHOD(void, WakeOnLanCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                = CHIP_NO_ERROR;
     WakeOnLanCluster * cppCluster = reinterpret_cast<WakeOnLanCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26519,10 +33454,11 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26532,24 +33468,29 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
     err = cppCluster->ResetCounts(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -26558,16 +33499,20 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, resetCounts)(JNIEnv * env, jobje
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(Platform::New<CHIPOctetStringAttributeCallback>(callback,
-        true), Platform::Delete<CHIPOctetStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPOctetStringAttributeCallback, void (*)(CHIPOctetStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPOctetStringAttributeCallback>(callback, true), Platform::Delete<CHIPOctetStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBssid(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26576,18 +33521,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBssidAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSecurityType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26596,18 +33547,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readSecurityTypeAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeWiFiVersion(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26616,18 +33573,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readWiFiVersionAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeChannelNumber(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26639,15 +33602,20 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readChannelNumberAttribute)(JNIE
 JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8sAttributeCallback, void (*)(CHIPInt8sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8sAttributeCallback>(callback), Platform::Delete<CHIPInt8sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRssi(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26656,18 +33624,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readRssiAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBeaconLostCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26676,18 +33650,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconLostCountAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeBeaconRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26696,18 +33676,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readBeaconRxCountAttribute)(JNIE
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketMulticastRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26716,18 +33702,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastRxCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketMulticastTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26736,18 +33728,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketMulticastTxCountAttrib
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketUnicastRxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26756,18 +33754,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastRxCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePacketUnicastTxCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26776,18 +33780,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readPacketUnicastTxCountAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentMaxRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26796,18 +33806,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readCurrentMaxRateAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt64uAttributeCallback, void (*)(CHIPInt64uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt64uAttributeCallback>(callback), Platform::Delete<CHIPInt64uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOverrunCount(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26816,18 +33832,24 @@ JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readOverrunCountAttribute)(JNIEn
     onFailure.release();
 }
 
-JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WiFiNetworkDiagnosticsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                             = CHIP_NO_ERROR;
     WiFiNetworkDiagnosticsCluster * cppCluster = reinterpret_cast<WiFiNetworkDiagnosticsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26849,10 +33871,11 @@ JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26862,37 +33885,44 @@ JNI_METHOD(void, WindowCoveringCluster, downOrClose)(JNIEnv * env, jobject self,
     err = cppCluster->DownOrClose(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftPercentageValue, jint liftPercent100thsValue)
+JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftPercentageValue, jint liftPercent100thsValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26902,37 +33932,44 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftPercentage)(JNIEnv * env, jobjec
     err = cppCluster->GoToLiftPercentage(onSuccess->Cancel(), onFailure->Cancel(), liftPercentageValue, liftPercent100thsValue);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftValue)
+JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint liftValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26942,37 +33979,44 @@ JNI_METHOD(void, WindowCoveringCluster, goToLiftValue)(JNIEnv * env, jobject sel
     err = cppCluster->GoToLiftValue(onSuccess->Cancel(), onFailure->Cancel(), liftValue);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltPercentageValue, jint tiltPercent100thsValue)
+JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltPercentageValue, jint tiltPercent100thsValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -26982,37 +34026,44 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltPercentage)(JNIEnv * env, jobjec
     err = cppCluster->GoToTiltPercentage(onSuccess->Cancel(), onFailure->Cancel(), tiltPercentageValue, tiltPercent100thsValue);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltValue)
+JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint tiltValue)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -27022,24 +34073,29 @@ JNI_METHOD(void, WindowCoveringCluster, goToTiltValue)(JNIEnv * env, jobject sel
     err = cppCluster->GoToTiltValue(onSuccess->Cancel(), onFailure->Cancel(), tiltValue);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -27049,10 +34105,11 @@ JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self,
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -27062,24 +34119,29 @@ JNI_METHOD(void, WindowCoveringCluster, stopMotion)(JNIEnv * env, jobject self,
     err = cppCluster->StopMotion(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -27089,10 +34151,11 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -27102,24 +34165,29 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
     err = cppCluster->UpOrOpen(onSuccess->Cancel(), onFailure->Cancel());
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -27128,15 +34196,20 @@ JNI_METHOD(void, WindowCoveringCluster, upOrOpen)(JNIEnv * env, jobject self, jl
 JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27145,18 +34218,24 @@ JNI_METHOD(void, WindowCoveringCluster, readTypeAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27165,18 +34244,24 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27188,15 +34273,20 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltAttribute)(JNIEnv
 JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeConfigStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27205,18 +34295,24 @@ JNI_METHOD(void, WindowCoveringCluster, readConfigStatusAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLiftPercentage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27225,54 +34321,72 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercentageAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercentage(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercentage(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionLiftPercentage(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTiltPercentage(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27281,54 +34395,72 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercentageAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercentage(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercentage(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercentageAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercentageAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionTiltPercentage(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27337,54 +34469,72 @@ JNI_METHOD(void, WindowCoveringCluster, readOperationalStatusAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeOperationalStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeOperationalStatus(onSuccess->Cancel(), onFailure->Cancel(),
+                                                          static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportOperationalStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportOperationalStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt8uAttributeCallback>(callback, true), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeOperationalStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27393,54 +34543,72 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionLiftPercent100thsAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeTargetPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeTargetPositionLiftPercent100ths(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeTargetPositionLiftPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeTargetPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27449,38 +34617,50 @@ JNI_METHOD(void, WindowCoveringCluster, readTargetPositionTiltPercent100thsAttri
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeTargetPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeTargetPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeTargetPositionTiltPercent100ths(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeTargetPositionTiltPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -27488,15 +34668,20 @@ JNI_METHOD(void, WindowCoveringCluster, reportTargetPositionTiltPercent100thsAtt
 JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEndProductType(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27505,18 +34690,24 @@ JNI_METHOD(void, WindowCoveringCluster, readEndProductTypeAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27525,54 +34716,72 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionLiftPercent100thsAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionLiftPercent100ths(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionLiftPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionLiftPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27581,54 +34790,72 @@ JNI_METHOD(void, WindowCoveringCluster, readCurrentPositionTiltPercent100thsAttr
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeCurrentPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercent100ths(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeCurrentPositionTiltPercent100ths(
+        onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercent100thsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, reportCurrentPositionTiltPercent100thsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeCurrentPositionTiltPercent100ths(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledOpenLimitLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27637,18 +34864,24 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitLiftAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledClosedLimitLift(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27657,18 +34890,24 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitLiftAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledOpenLimitTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27677,18 +34916,24 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledOpenLimitTiltAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeInstalledClosedLimitTilt(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27700,15 +34945,20 @@ JNI_METHOD(void, WindowCoveringCluster, readInstalledClosedLimitTiltAttribute)(J
 JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27717,21 +34967,27 @@ JNI_METHOD(void, WindowCoveringCluster, readModeAttribute)(JNIEnv * env, jobject
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -27740,15 +34996,20 @@ JNI_METHOD(void, WindowCoveringCluster, writeModeAttribute)(JNIEnv * env, jobjec
 JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -27757,20 +35018,27 @@ JNI_METHOD(void, WindowCoveringCluster, readSafetyStatusAttribute)(JNIEnv * env,
     onFailure.release();
 }
 
-JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeSafetyStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                     static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -27780,19 +35048,24 @@ JNI_METHOD(void, WindowCoveringCluster, subscribeSafetyStatusAttribute)(JNIEnv *
 JNI_METHOD(void, WindowCoveringCluster, reportSafetyStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeSafetyStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 JNI_METHOD(void, WindowCoveringCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -27824,17 +35097,26 @@ JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
 =======
 JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+>>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     WindowCoveringCluster * cppCluster = reinterpret_cast<WindowCoveringCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index df08d156b491a8..554b04ee8beba8 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -25,37 +25,43 @@ public class ChipClusters {
 
   public interface DefaultClusterCallback {
     void onSuccess();
+
     void onError(Exception error);
   }
 
   public interface CharStringAttributeCallback {
     /** Indicates a successful read for a CHAR_STRING attribute. */
     void onSuccess(String value);
+
     void onError(Exception error);
   }
 
   public interface OctetStringAttributeCallback {
     /** Indicates a successful read for an OCTET_STRING attribute. */
     void onSuccess(byte[] value);
+
     void onError(Exception error);
   }
 
   public interface IntegerAttributeCallback {
     void onSuccess(int value);
+
     void onError(Exception error);
   }
 
   public interface LongAttributeCallback {
     void onSuccess(long value);
+
     void onError(Exception error);
   }
 
   public interface BooleanAttributeCallback {
     void onSuccess(boolean value);
+
     void onError(Exception error);
   }
 
-  public static abstract class BaseChipCluster {
+  public abstract static class BaseChipCluster {
     protected long chipClusterPtr;
 
     public BaseChipCluster(long devicePtr, int endpointId) {
@@ -65,7 +71,7 @@ public BaseChipCluster(long devicePtr, int endpointId) {
     public abstract long initWithDevice(long devicePtr, int endpointId);
 
     public native void deleteCluster(long chipClusterPtr);
-    
+
     @SuppressWarnings("deprecation")
     protected void finalize() throws Throwable {
       super.finalize();
@@ -93,32 +99,32 @@ public void getSetupPIN(GetSetupPINResponseCallback callback, String tempAccount
       getSetupPIN(chipClusterPtr, callback, tempAccountIdentifier);
     }
 
-
-    public void login(DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN) {
+    public void login(
+        DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN) {
       login(chipClusterPtr, callback, tempAccountIdentifier, setupPIN);
     }
 
-    private native void getSetupPIN(long chipClusterPtr, GetSetupPINResponseCallback callback, String tempAccountIdentifier);
-    private native void login(long chipClusterPtr, DefaultClusterCallback callback, String tempAccountIdentifier, String setupPIN);
+    private native void getSetupPIN(
+        long chipClusterPtr, GetSetupPINResponseCallback callback, String tempAccountIdentifier);
+
+    private native void login(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        String tempAccountIdentifier,
+        String setupPIN);
+
     public interface GetSetupPINResponseCallback {
-      void onSuccess(
-      String setupPIN
-      );
-      
+      void onSuccess(String setupPIN);
+
       void onError(Exception error);
     }
 
-
-
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class AdministratorCommissioningCluster extends BaseChipCluster {
@@ -133,34 +139,55 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void openBasicCommissioningWindow(DefaultClusterCallback callback, int commissioningTimeout) {
+    public void openBasicCommissioningWindow(
+        DefaultClusterCallback callback, int commissioningTimeout) {
       openBasicCommissioningWindow(chipClusterPtr, callback, commissioningTimeout);
     }
 
-
-    public void openCommissioningWindow(DefaultClusterCallback callback, int commissioningTimeout, byte[] PAKEVerifier, int discriminator, long iterations, byte[] salt, int passcodeID) {
-      openCommissioningWindow(chipClusterPtr, callback, commissioningTimeout, PAKEVerifier, discriminator, iterations, salt, passcodeID);
+    public void openCommissioningWindow(
+        DefaultClusterCallback callback,
+        int commissioningTimeout,
+        byte[] PAKEVerifier,
+        int discriminator,
+        long iterations,
+        byte[] salt,
+        int passcodeID) {
+      openCommissioningWindow(
+          chipClusterPtr,
+          callback,
+          commissioningTimeout,
+          PAKEVerifier,
+          discriminator,
+          iterations,
+          salt,
+          passcodeID);
     }
 
-
     public void revokeCommissioning(DefaultClusterCallback callback) {
       revokeCommissioning(chipClusterPtr, callback);
     }
 
-    private native void openBasicCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout);
-    private native void openCommissioningWindow(long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout, byte[] PAKEVerifier, int discriminator, long iterations, byte[] salt, int passcodeID);
-    private native void revokeCommissioning(long chipClusterPtr, DefaultClusterCallback callback);
+    private native void openBasicCommissioningWindow(
+        long chipClusterPtr, DefaultClusterCallback callback, int commissioningTimeout);
 
+    private native void openCommissioningWindow(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int commissioningTimeout,
+        byte[] PAKEVerifier,
+        int discriminator,
+        long iterations,
+        byte[] salt,
+        int passcodeID);
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    private native void revokeCommissioning(long chipClusterPtr, DefaultClusterCallback callback);
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class ApplicationBasicCluster extends BaseChipCluster {
@@ -179,88 +206,64 @@ public void changeStatus(DefaultClusterCallback callback, int status) {
       changeStatus(chipClusterPtr, callback, status);
     }
 
-    private native void changeStatus(long chipClusterPtr, DefaultClusterCallback callback, int status);
+    private native void changeStatus(
+        long chipClusterPtr, DefaultClusterCallback callback, int status);
 
-
-    public void readVendorNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readVendorIdAttribute(IntegerAttributeCallback callback) {
       readVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readApplicationNameAttribute(CharStringAttributeCallback callback) {
       readApplicationNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readProductIdAttribute(IntegerAttributeCallback callback) {
       readProductIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationIdAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readApplicationIdAttribute(CharStringAttributeCallback callback) {
       readApplicationIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readCatalogVendorIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCatalogVendorIdAttribute(IntegerAttributeCallback callback) {
       readCatalogVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readApplicationStatusAttribute(IntegerAttributeCallback callback) {
       readApplicationStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readVendorNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readVendorIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readApplicationNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readApplicationIdAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readCatalogVendorIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readApplicationStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readVendorIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readApplicationNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readApplicationIdAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readCatalogVendorIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readApplicationStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class ApplicationLauncherCluster extends BaseChipCluster {
@@ -275,68 +278,61 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void launchApp(LaunchAppResponseCallback callback, String data, int catalogVendorId, String applicationId) {
+    public void launchApp(
+        LaunchAppResponseCallback callback,
+        String data,
+        int catalogVendorId,
+        String applicationId) {
       launchApp(chipClusterPtr, callback, data, catalogVendorId, applicationId);
     }
 
-    private native void launchApp(long chipClusterPtr, LaunchAppResponseCallback callback, String data, int catalogVendorId, String applicationId);
+    private native void launchApp(
+        long chipClusterPtr,
+        LaunchAppResponseCallback callback,
+        String data,
+        int catalogVendorId,
+        String applicationId);
+
     public interface LaunchAppResponseCallback {
-      void onSuccess(
-      int status
-      , String data
-      );
-      
+      void onSuccess(int status, String data);
+
       void onError(Exception error);
     }
 
-
-
     public interface ApplicationLauncherListAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
+      void onSuccess(List<Integer> valueList);
+
       void onError(Exception ex);
     }
 
     public void readApplicationLauncherListAttribute(
-      ApplicationLauncherListAttributeCallback callback
-    ) {
+        ApplicationLauncherListAttributeCallback callback) {
       readApplicationLauncherListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCatalogVendorIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCatalogVendorIdAttribute(IntegerAttributeCallback callback) {
       readCatalogVendorIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readApplicationIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readApplicationIdAttribute(IntegerAttributeCallback callback) {
       readApplicationIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readApplicationLauncherListAttribute(long chipClusterPtr,
-      ApplicationLauncherListAttributeCallback callback
-    );
-  
-    private native void readCatalogVendorIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readApplicationIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readApplicationLauncherListAttribute(
+        long chipClusterPtr, ApplicationLauncherListAttributeCallback callback);
+
+    private native void readCatalogVendorIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readApplicationIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class AudioOutputCluster extends BaseChipCluster {
@@ -355,16 +351,19 @@ public void renameOutput(DefaultClusterCallback callback, int index, String name
       renameOutput(chipClusterPtr, callback, index, name);
     }
 
-
     public void selectOutput(DefaultClusterCallback callback, int index) {
       selectOutput(chipClusterPtr, callback, index);
     }
 
-    private native void renameOutput(long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
-    private native void selectOutput(long chipClusterPtr, DefaultClusterCallback callback, int index);
+    private native void renameOutput(
+        long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
+
+    private native void selectOutput(
+        long chipClusterPtr, DefaultClusterCallback callback, int index);
 
     public static class AudioOutputListAttribute {
       public int index;
+<<<<<<< HEAD
             public int outputType;
             public String name;
 
@@ -373,6 +372,12 @@ public AudioOutputListAttribute(
                 int outputType,
                 String name
       ) {
+=======
+      public int outputType;
+      public byte[] name;
+
+      public AudioOutputListAttribute(int index, int outputType, byte[] name) {
+>>>>>>> e993d01f0 (callback generation done)
         this.index = index;
         this.outputType = outputType;
         this.name = name;
@@ -380,41 +385,31 @@ public AudioOutputListAttribute(
     }
 
     public interface AudioOutputListAttributeCallback {
-      void onSuccess(List<
-      AudioOutputListAttribute
-      > valueList);
+      void onSuccess(List<AudioOutputListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readAudioOutputListAttribute(
-      AudioOutputListAttributeCallback callback
-    ) {
+    public void readAudioOutputListAttribute(AudioOutputListAttributeCallback callback) {
       readAudioOutputListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentAudioOutputAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentAudioOutputAttribute(IntegerAttributeCallback callback) {
       readCurrentAudioOutputAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readAudioOutputListAttribute(long chipClusterPtr,
-      AudioOutputListAttributeCallback callback
-    );
-  
-    private native void readCurrentAudioOutputAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readAudioOutputListAttribute(
+        long chipClusterPtr, AudioOutputListAttributeCallback callback);
+
+    private native void readCurrentAudioOutputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BarrierControlCluster extends BaseChipCluster {
@@ -433,64 +428,49 @@ public void barrierControlGoToPercent(DefaultClusterCallback callback, int perce
       barrierControlGoToPercent(chipClusterPtr, callback, percentOpen);
     }
 
-
     public void barrierControlStop(DefaultClusterCallback callback) {
       barrierControlStop(chipClusterPtr, callback);
     }
 
-    private native void barrierControlGoToPercent(long chipClusterPtr, DefaultClusterCallback callback, int percentOpen);
-    private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback callback);
+    private native void barrierControlGoToPercent(
+        long chipClusterPtr, DefaultClusterCallback callback, int percentOpen);
 
+    private native void barrierControlStop(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readBarrierMovingStateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBarrierMovingStateAttribute(IntegerAttributeCallback callback) {
       readBarrierMovingStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierSafetyStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBarrierSafetyStatusAttribute(IntegerAttributeCallback callback) {
       readBarrierSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierCapabilitiesAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBarrierCapabilitiesAttribute(IntegerAttributeCallback callback) {
       readBarrierCapabilitiesAttribute(chipClusterPtr, callback);
     }
 
-    public void readBarrierPositionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBarrierPositionAttribute(IntegerAttributeCallback callback) {
       readBarrierPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readBarrierMovingStateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBarrierSafetyStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBarrierCapabilitiesAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBarrierPositionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readBarrierMovingStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBarrierSafetyStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBarrierCapabilitiesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBarrierPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BasicCluster extends BaseChipCluster {
@@ -511,40 +491,27 @@ public void mfgSpecificPing(DefaultClusterCallback callback) {
 
     private native void mfgSpecificPing(long chipClusterPtr, DefaultClusterCallback callback);
 
-
-    public void readInteractionModelVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInteractionModelVersionAttribute(IntegerAttributeCallback callback) {
       readInteractionModelVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIDAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
       readVendorIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductNameAttribute(CharStringAttributeCallback callback) {
       readProductNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductIDAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readProductIDAttribute(IntegerAttributeCallback callback) {
       readProductIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readUserLabelAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readUserLabelAttribute(CharStringAttributeCallback callback) {
       readUserLabelAttribute(chipClusterPtr, callback);
     }
 
@@ -552,9 +519,7 @@ public void writeUserLabelAttribute(DefaultClusterCallback callback, String valu
       writeUserLabelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readLocationAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readLocationAttribute(CharStringAttributeCallback callback) {
       readLocationAttribute(chipClusterPtr, callback);
     }
 
@@ -562,63 +527,43 @@ public void writeLocationAttribute(DefaultClusterCallback callback, String value
       writeLocationAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readHardwareVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
       readHardwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readHardwareVersionStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
       readHardwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
       readSoftwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
       readSoftwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readManufacturingDateAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
       readManufacturingDateAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartNumberAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
       readPartNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductURLAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductURLAttribute(CharStringAttributeCallback callback) {
       readProductURLAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductLabelAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
       readProductLabelAttribute(chipClusterPtr, callback);
     }
 
-    public void readSerialNumberAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
       readSerialNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readLocalConfigDisabledAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readLocalConfigDisabledAttribute(BooleanAttributeCallback callback) {
       readLocalConfigDisabledAttribute(chipClusterPtr, callback);
     }
 
@@ -626,99 +571,79 @@ public void writeLocalConfigDisabledAttribute(DefaultClusterCallback callback, b
       writeLocalConfigDisabledAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readReachableAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readReachableAttribute(BooleanAttributeCallback callback) {
       readReachableAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readInteractionModelVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readVendorNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readVendorIDAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readProductNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductIDAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readUserLabelAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
 
-    private native void writeUserLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
-  
-    private native void readLocationAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
+    private native void readInteractionModelVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeLocationAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
-  
-    private native void readHardwareVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readSoftwareVersionAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readManufacturingDateAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readPartNumberAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductURLAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductLabelAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readSerialNumberAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readLocalConfigDisabledAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void writeLocalConfigDisabledAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-  
-    private native void readReachableAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readVendorIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readProductNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readUserLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeUserLabelAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, String value);
+
+    private native void readLocationAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void writeLocationAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, String value);
+
+    private native void readHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readHardwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readSoftwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readManufacturingDateAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readPartNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductURLAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readSerialNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readLocalConfigDisabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void writeLocalConfigDisabledAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+
+    private native void readReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BinaryInputBasicCluster extends BaseChipCluster {
@@ -733,10 +658,7 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readOutOfServiceAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readOutOfServiceAttribute(BooleanAttributeCallback callback) {
       readOutOfServiceAttribute(chipClusterPtr, callback);
     }
 
@@ -744,9 +666,7 @@ public void writeOutOfServiceAttribute(DefaultClusterCallback callback, boolean
       writeOutOfServiceAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readPresentValueAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readPresentValueAttribute(BooleanAttributeCallback callback) {
       readPresentValueAttribute(chipClusterPtr, callback);
     }
 
@@ -754,7 +674,8 @@ public void writePresentValueAttribute(DefaultClusterCallback callback, boolean
       writePresentValueAttribute(chipClusterPtr, callback, value);
     }
 
-    public void subscribePresentValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribePresentValueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribePresentValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -762,13 +683,12 @@ public void reportPresentValueAttribute(BooleanAttributeCallback callback) {
       reportPresentValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readStatusFlagsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStatusFlagsAttribute(IntegerAttributeCallback callback) {
       readStatusFlagsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStatusFlagsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeStatusFlagsAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeStatusFlagsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -776,39 +696,39 @@ public void reportStatusFlagsAttribute(IntegerAttributeCallback callback) {
       reportStatusFlagsAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readOutOfServiceAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
 
-    private native void writeOutOfServiceAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-  
-    private native void readPresentValueAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
+    private native void readOutOfServiceAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
+    private native void writeOutOfServiceAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
 
-    private native void subscribePresentValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readPresentValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void reportPresentValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-  
-    private native void readStatusFlagsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writePresentValueAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
 
-    private native void subscribeStatusFlagsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribePresentValueAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportStatusFlagsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportPresentValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readStatusFlagsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeStatusFlagsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportStatusFlagsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BindingCluster extends BaseChipCluster {
@@ -823,28 +743,38 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void bind(DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
+    public void bind(
+        DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
       bind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId);
     }
 
-
-    public void unbind(DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
+    public void unbind(
+        DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId) {
       unbind(chipClusterPtr, callback, nodeId, groupId, endpointId, clusterId);
     }
 
-    private native void bind(long chipClusterPtr, DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId);
-    private native void unbind(long chipClusterPtr, DefaultClusterCallback callback, long nodeId, int groupId, int endpointId, long clusterId);
+    private native void bind(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        long nodeId,
+        int groupId,
+        int endpointId,
+        long clusterId);
 
+    private native void unbind(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        long nodeId,
+        int groupId,
+        int endpointId,
+        long clusterId);
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BooleanStateCluster extends BaseChipCluster {
@@ -1087,28 +1017,19 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readVendorNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readVendorNameAttribute(CharStringAttributeCallback callback) {
       readVendorNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readVendorIDAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readVendorIDAttribute(IntegerAttributeCallback callback) {
       readVendorIDAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductNameAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductNameAttribute(CharStringAttributeCallback callback) {
       readProductNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readUserLabelAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readUserLabelAttribute(CharStringAttributeCallback callback) {
       readUserLabelAttribute(chipClusterPtr, callback);
     }
 
@@ -1116,269 +1037,532 @@ public void writeUserLabelAttribute(DefaultClusterCallback callback, String valu
       writeUserLabelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readHardwareVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readHardwareVersionAttribute(IntegerAttributeCallback callback) {
       readHardwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readHardwareVersionStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readHardwareVersionStringAttribute(CharStringAttributeCallback callback) {
       readHardwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readSoftwareVersionAttribute(LongAttributeCallback callback) {
       readSoftwareVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readSoftwareVersionStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readSoftwareVersionStringAttribute(CharStringAttributeCallback callback) {
       readSoftwareVersionStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readManufacturingDateAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readManufacturingDateAttribute(CharStringAttributeCallback callback) {
       readManufacturingDateAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartNumberAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readPartNumberAttribute(CharStringAttributeCallback callback) {
       readPartNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductURLAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductURLAttribute(CharStringAttributeCallback callback) {
       readProductURLAttribute(chipClusterPtr, callback);
     }
 
-    public void readProductLabelAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readProductLabelAttribute(CharStringAttributeCallback callback) {
       readProductLabelAttribute(chipClusterPtr, callback);
     }
 
-    public void readSerialNumberAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readSerialNumberAttribute(CharStringAttributeCallback callback) {
       readSerialNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readReachableAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readReachableAttribute(BooleanAttributeCallback callback) {
       readReachableAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readVendorNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readVendorIDAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readProductNameAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readUserLabelAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
 
-    private native void writeUserLabelAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
-  
-    private native void readHardwareVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readHardwareVersionStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readSoftwareVersionAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readSoftwareVersionStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readManufacturingDateAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readPartNumberAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductURLAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readProductLabelAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readSerialNumberAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readReachableAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  }
+    private native void readVendorNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-  public static class ColorControlCluster extends BaseChipCluster {
-    public ColorControlCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void readVendorIDAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public static long clusterId() {
-      return Long.parseUnsignedLong("768");
-    }
+    private native void readProductNameAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void readUserLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    public void colorLoopSet(DefaultClusterCallback callback, int updateFlags, int action, int direction, int time, int startHue, int optionsMask, int optionsOverride) {
-      colorLoopSet(chipClusterPtr, callback, updateFlags, action, direction, time, startHue, optionsMask, optionsOverride);
-    }
+    private native void writeUserLabelAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, String value);
 
+    private native void readHardwareVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void enhancedMoveHue(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
-      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
-    }
+    private native void readHardwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
+    private native void readSoftwareVersionAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
 
-    public void enhancedMoveToHue(DefaultClusterCallback callback, int enhancedHue, int direction, int transitionTime, int optionsMask, int optionsOverride) {
-      enhancedMoveToHue(chipClusterPtr, callback, enhancedHue, direction, transitionTime, optionsMask, optionsOverride);
-    }
+    private native void readSoftwareVersionStringAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readManufacturingDateAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readPartNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductURLAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readProductLabelAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readSerialNumberAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readReachableAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+  }
 
+  public static class ColorControlCluster extends BaseChipCluster {
+    public ColorControlCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    public void enhancedMoveToHueAndSaturation(DefaultClusterCallback callback, int enhancedHue, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
-      enhancedMoveToHueAndSaturation(chipClusterPtr, callback, enhancedHue, saturation, transitionTime, optionsMask, optionsOverride);
+    public static long clusterId() {
+      return Long.parseUnsignedLong("768");
     }
 
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void enhancedStepHue(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
-      enhancedStepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
+    public void colorLoopSet(
+        DefaultClusterCallback callback,
+        int updateFlags,
+        int action,
+        int direction,
+        int time,
+        int startHue,
+        int optionsMask,
+        int optionsOverride) {
+      colorLoopSet(
+          chipClusterPtr,
+          callback,
+          updateFlags,
+          action,
+          direction,
+          time,
+          startHue,
+          optionsMask,
+          optionsOverride);
     }
 
+    public void enhancedMoveHue(
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride) {
+      enhancedMoveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
+    }
 
-    public void moveColor(DefaultClusterCallback callback, int rateX, int rateY, int optionsMask, int optionsOverride) {
-      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride);
+    public void enhancedMoveToHue(
+        DefaultClusterCallback callback,
+        int enhancedHue,
+        int direction,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      enhancedMoveToHue(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          direction,
+          transitionTime,
+          optionsMask,
+          optionsOverride);
+    }
+
+    public void enhancedMoveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        int enhancedHue,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      enhancedMoveToHueAndSaturation(
+          chipClusterPtr,
+          callback,
+          enhancedHue,
+          saturation,
+          transitionTime,
+          optionsMask,
+          optionsOverride);
     }
 
+    public void enhancedStepHue(
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      enhancedStepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride);
+    }
 
-    public void moveColorTemperature(DefaultClusterCallback callback, int moveMode, int rate, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride) {
-      moveColorTemperature(chipClusterPtr, callback, moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
+    public void moveColor(
+        DefaultClusterCallback callback,
+        int rateX,
+        int rateY,
+        int optionsMask,
+        int optionsOverride) {
+      moveColor(chipClusterPtr, callback, rateX, rateY, optionsMask, optionsOverride);
     }
 
+    public void moveColorTemperature(
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int colorTemperatureMinimum,
+        int colorTemperatureMaximum,
+        int optionsMask,
+        int optionsOverride) {
+      moveColorTemperature(
+          chipClusterPtr,
+          callback,
+          moveMode,
+          rate,
+          colorTemperatureMinimum,
+          colorTemperatureMaximum,
+          optionsMask,
+          optionsOverride);
+    }
 
-    public void moveHue(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
+    public void moveHue(
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride) {
       moveHue(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
     }
 
-
-    public void moveSaturation(DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride) {
+    public void moveSaturation(
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride) {
       moveSaturation(chipClusterPtr, callback, moveMode, rate, optionsMask, optionsOverride);
     }
 
+    public void moveToColor(
+        DefaultClusterCallback callback,
+        int colorX,
+        int colorY,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      moveToColor(
+          chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    }
 
-    public void moveToColor(DefaultClusterCallback callback, int colorX, int colorY, int transitionTime, int optionsMask, int optionsOverride) {
-      moveToColor(chipClusterPtr, callback, colorX, colorY, transitionTime, optionsMask, optionsOverride);
+    public void moveToColorTemperature(
+        DefaultClusterCallback callback,
+        int colorTemperature,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      moveToColorTemperature(
+          chipClusterPtr, callback, colorTemperature, transitionTime, optionsMask, optionsOverride);
     }
 
+    public void moveToHue(
+        DefaultClusterCallback callback,
+        int hue,
+        int direction,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      moveToHue(
+          chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride);
+    }
 
-    public void moveToColorTemperature(DefaultClusterCallback callback, int colorTemperature, int transitionTime, int optionsMask, int optionsOverride) {
-      moveToColorTemperature(chipClusterPtr, callback, colorTemperature, transitionTime, optionsMask, optionsOverride);
+    public void moveToHueAndSaturation(
+        DefaultClusterCallback callback,
+        int hue,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      moveToHueAndSaturation(
+          chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride);
     }
 
+    public void moveToSaturation(
+        DefaultClusterCallback callback,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      moveToSaturation(
+          chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride);
+    }
 
-    public void moveToHue(DefaultClusterCallback callback, int hue, int direction, int transitionTime, int optionsMask, int optionsOverride) {
-      moveToHue(chipClusterPtr, callback, hue, direction, transitionTime, optionsMask, optionsOverride);
+    public void stepColor(
+        DefaultClusterCallback callback,
+        int stepX,
+        int stepY,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      stepColor(
+          chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride);
     }
 
+    public void stepColorTemperature(
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int colorTemperatureMinimum,
+        int colorTemperatureMaximum,
+        int optionsMask,
+        int optionsOverride) {
+      stepColorTemperature(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          colorTemperatureMinimum,
+          colorTemperatureMaximum,
+          optionsMask,
+          optionsOverride);
+    }
 
-    public void moveToHueAndSaturation(DefaultClusterCallback callback, int hue, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
-      moveToHueAndSaturation(chipClusterPtr, callback, hue, saturation, transitionTime, optionsMask, optionsOverride);
+    public void stepHue(
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      stepHue(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride);
     }
 
+    public void stepSaturation(
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride) {
+      stepSaturation(
+          chipClusterPtr,
+          callback,
+          stepMode,
+          stepSize,
+          transitionTime,
+          optionsMask,
+          optionsOverride);
+    }
 
-    public void moveToSaturation(DefaultClusterCallback callback, int saturation, int transitionTime, int optionsMask, int optionsOverride) {
-      moveToSaturation(chipClusterPtr, callback, saturation, transitionTime, optionsMask, optionsOverride);
+    public void stopMoveStep(
+        DefaultClusterCallback callback, int optionsMask, int optionsOverride) {
+      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride);
     }
 
+    private native void colorLoopSet(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int updateFlags,
+        int action,
+        int direction,
+        int time,
+        int startHue,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void enhancedMoveHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride);
 
-    public void stepColor(DefaultClusterCallback callback, int stepX, int stepY, int transitionTime, int optionsMask, int optionsOverride) {
-      stepColor(chipClusterPtr, callback, stepX, stepY, transitionTime, optionsMask, optionsOverride);
-    }
+    private native void enhancedMoveToHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int enhancedHue,
+        int direction,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
+    private native void enhancedMoveToHueAndSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int enhancedHue,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
-    public void stepColorTemperature(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride) {
-      stepColorTemperature(chipClusterPtr, callback, stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
-    }
+    private native void enhancedStepHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
+    private native void moveColor(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int rateX,
+        int rateY,
+        int optionsMask,
+        int optionsOverride);
 
-    public void stepHue(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
-      stepHue(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-    }
+    private native void moveColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int colorTemperatureMinimum,
+        int colorTemperatureMaximum,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void moveHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride);
 
+    private native void moveSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionsMask,
+        int optionsOverride);
 
-    public void stepSaturation(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride) {
-      stepSaturation(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
-    }
+    private native void moveToColor(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int colorX,
+        int colorY,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void moveToColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int colorTemperature,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
+    private native void moveToHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int hue,
+        int direction,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
-    public void stopMoveStep(DefaultClusterCallback callback, int optionsMask, int optionsOverride) {
-      stopMoveStep(chipClusterPtr, callback, optionsMask, optionsOverride);
-    }
+    private native void moveToHueAndSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int hue,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
 
-    private native void colorLoopSet(long chipClusterPtr, DefaultClusterCallback callback, int updateFlags, int action, int direction, int time, int startHue, int optionsMask, int optionsOverride);
-    private native void enhancedMoveHue(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
-    private native void enhancedMoveToHue(long chipClusterPtr, DefaultClusterCallback callback, int enhancedHue, int direction, int transitionTime, int optionsMask, int optionsOverride);
-    private native void enhancedMoveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, int enhancedHue, int saturation, int transitionTime, int optionsMask, int optionsOverride);
-    private native void enhancedStepHue(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
-    private native void moveColor(long chipClusterPtr, DefaultClusterCallback callback, int rateX, int rateY, int optionsMask, int optionsOverride);
-    private native void moveColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride);
-    private native void moveHue(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
-    private native void moveSaturation(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionsMask, int optionsOverride);
-    private native void moveToColor(long chipClusterPtr, DefaultClusterCallback callback, int colorX, int colorY, int transitionTime, int optionsMask, int optionsOverride);
-    private native void moveToColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int colorTemperature, int transitionTime, int optionsMask, int optionsOverride);
-    private native void moveToHue(long chipClusterPtr, DefaultClusterCallback callback, int hue, int direction, int transitionTime, int optionsMask, int optionsOverride);
-    private native void moveToHueAndSaturation(long chipClusterPtr, DefaultClusterCallback callback, int hue, int saturation, int transitionTime, int optionsMask, int optionsOverride);
-    private native void moveToSaturation(long chipClusterPtr, DefaultClusterCallback callback, int saturation, int transitionTime, int optionsMask, int optionsOverride);
-    private native void stepColor(long chipClusterPtr, DefaultClusterCallback callback, int stepX, int stepY, int transitionTime, int optionsMask, int optionsOverride);
-    private native void stepColorTemperature(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int colorTemperatureMinimum, int colorTemperatureMaximum, int optionsMask, int optionsOverride);
-    private native void stepHue(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
-    private native void stepSaturation(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionsMask, int optionsOverride);
-    private native void stopMoveStep(long chipClusterPtr, DefaultClusterCallback callback, int optionsMask, int optionsOverride);
-
-
-    public void readCurrentHueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    private native void moveToSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int saturation,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void stepColor(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepX,
+        int stepY,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void stepColorTemperature(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int colorTemperatureMinimum,
+        int colorTemperatureMaximum,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void stepHue(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void stepSaturation(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionsMask,
+        int optionsOverride);
+
+    private native void stopMoveStep(
+        long chipClusterPtr, DefaultClusterCallback callback, int optionsMask, int optionsOverride);
+
+    public void readCurrentHueAttribute(IntegerAttributeCallback callback) {
       readCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentHueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentHueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentHueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1386,13 +1570,12 @@ public void reportCurrentHueAttribute(IntegerAttributeCallback callback) {
       reportCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentSaturationAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentSaturationAttribute(IntegerAttributeCallback callback) {
       readCurrentSaturationAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentSaturationAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentSaturationAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentSaturationAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1400,19 +1583,16 @@ public void reportCurrentSaturationAttribute(IntegerAttributeCallback callback)
       reportCurrentSaturationAttribute(chipClusterPtr, callback);
     }
 
-    public void readRemainingTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentXAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentXAttribute(IntegerAttributeCallback callback) {
       readCurrentXAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentXAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentXAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentXAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1420,13 +1600,12 @@ public void reportCurrentXAttribute(IntegerAttributeCallback callback) {
       reportCurrentXAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentYAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentYAttribute(IntegerAttributeCallback callback) {
       readCurrentYAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentYAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentYAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1434,25 +1613,20 @@ public void reportCurrentYAttribute(IntegerAttributeCallback callback) {
       reportCurrentYAttribute(chipClusterPtr, callback);
     }
 
-    public void readDriftCompensationAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readDriftCompensationAttribute(IntegerAttributeCallback callback) {
       readDriftCompensationAttribute(chipClusterPtr, callback);
     }
 
-    public void readCompensationTextAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readCompensationTextAttribute(CharStringAttributeCallback callback) {
       readCompensationTextAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTemperatureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorTemperatureAttribute(IntegerAttributeCallback callback) {
       readColorTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeColorTemperatureAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeColorTemperatureAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeColorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -1460,15 +1634,11 @@ public void reportColorTemperatureAttribute(IntegerAttributeCallback callback) {
       reportColorTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorModeAttribute(IntegerAttributeCallback callback) {
       readColorModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorControlOptionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorControlOptionsAttribute(IntegerAttributeCallback callback) {
       readColorControlOptionsAttribute(chipClusterPtr, callback);
     }
 
@@ -1476,123 +1646,83 @@ public void writeColorControlOptionsAttribute(DefaultClusterCallback callback, i
       writeColorControlOptionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readNumberOfPrimariesAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNumberOfPrimariesAttribute(IntegerAttributeCallback callback) {
       readNumberOfPrimariesAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary1XAttribute(IntegerAttributeCallback callback) {
       readPrimary1XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary1YAttribute(IntegerAttributeCallback callback) {
       readPrimary1YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary1IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary1IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary1IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary2XAttribute(IntegerAttributeCallback callback) {
       readPrimary2XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary2YAttribute(IntegerAttributeCallback callback) {
       readPrimary2YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary2IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary2IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary2IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary3XAttribute(IntegerAttributeCallback callback) {
       readPrimary3XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary3YAttribute(IntegerAttributeCallback callback) {
       readPrimary3YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary3IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary3IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary3IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary4XAttribute(IntegerAttributeCallback callback) {
       readPrimary4XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary4YAttribute(IntegerAttributeCallback callback) {
       readPrimary4YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary4IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary4IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary4IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary5XAttribute(IntegerAttributeCallback callback) {
       readPrimary5XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary5YAttribute(IntegerAttributeCallback callback) {
       readPrimary5YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary5IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary5IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary5IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6XAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary6XAttribute(IntegerAttributeCallback callback) {
       readPrimary6XAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6YAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary6YAttribute(IntegerAttributeCallback callback) {
       readPrimary6YAttribute(chipClusterPtr, callback);
     }
 
-    public void readPrimary6IntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPrimary6IntensityAttribute(IntegerAttributeCallback callback) {
       readPrimary6IntensityAttribute(chipClusterPtr, callback);
     }
 
-    public void readWhitePointXAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readWhitePointXAttribute(IntegerAttributeCallback callback) {
       readWhitePointXAttribute(chipClusterPtr, callback);
     }
 
@@ -1600,9 +1730,7 @@ public void writeWhitePointXAttribute(DefaultClusterCallback callback, int value
       writeWhitePointXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readWhitePointYAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readWhitePointYAttribute(IntegerAttributeCallback callback) {
       readWhitePointYAttribute(chipClusterPtr, callback);
     }
 
@@ -1610,9 +1738,7 @@ public void writeWhitePointYAttribute(DefaultClusterCallback callback, int value
       writeWhitePointYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRXAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointRXAttribute(IntegerAttributeCallback callback) {
       readColorPointRXAttribute(chipClusterPtr, callback);
     }
 
@@ -1620,9 +1746,7 @@ public void writeColorPointRXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointRXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRYAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointRYAttribute(IntegerAttributeCallback callback) {
       readColorPointRYAttribute(chipClusterPtr, callback);
     }
 
@@ -1630,9 +1754,7 @@ public void writeColorPointRYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointRYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointRIntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointRIntensityAttribute(IntegerAttributeCallback callback) {
       readColorPointRIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1640,9 +1762,7 @@ public void writeColorPointRIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointRIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGXAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointGXAttribute(IntegerAttributeCallback callback) {
       readColorPointGXAttribute(chipClusterPtr, callback);
     }
 
@@ -1650,9 +1770,7 @@ public void writeColorPointGXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointGXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGYAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointGYAttribute(IntegerAttributeCallback callback) {
       readColorPointGYAttribute(chipClusterPtr, callback);
     }
 
@@ -1660,9 +1778,7 @@ public void writeColorPointGYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointGYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointGIntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointGIntensityAttribute(IntegerAttributeCallback callback) {
       readColorPointGIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1670,9 +1786,7 @@ public void writeColorPointGIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointGIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBXAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointBXAttribute(IntegerAttributeCallback callback) {
       readColorPointBXAttribute(chipClusterPtr, callback);
     }
 
@@ -1680,9 +1794,7 @@ public void writeColorPointBXAttribute(DefaultClusterCallback callback, int valu
       writeColorPointBXAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBYAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointBYAttribute(IntegerAttributeCallback callback) {
       readColorPointBYAttribute(chipClusterPtr, callback);
     }
 
@@ -1690,9 +1802,7 @@ public void writeColorPointBYAttribute(DefaultClusterCallback callback, int valu
       writeColorPointBYAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readColorPointBIntensityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorPointBIntensityAttribute(IntegerAttributeCallback callback) {
       readColorPointBIntensityAttribute(chipClusterPtr, callback);
     }
 
@@ -1700,537 +1810,450 @@ public void writeColorPointBIntensityAttribute(DefaultClusterCallback callback,
       writeColorPointBIntensityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnhancedCurrentHueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEnhancedCurrentHueAttribute(IntegerAttributeCallback callback) {
       readEnhancedCurrentHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readEnhancedColorModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEnhancedColorModeAttribute(IntegerAttributeCallback callback) {
       readEnhancedColorModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopActiveAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorLoopActiveAttribute(IntegerAttributeCallback callback) {
       readColorLoopActiveAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopDirectionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorLoopDirectionAttribute(IntegerAttributeCallback callback) {
       readColorLoopDirectionAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorLoopTimeAttribute(IntegerAttributeCallback callback) {
       readColorLoopTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopStartEnhancedHueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorLoopStartEnhancedHueAttribute(IntegerAttributeCallback callback) {
       readColorLoopStartEnhancedHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorLoopStoredEnhancedHueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorLoopStoredEnhancedHueAttribute(IntegerAttributeCallback callback) {
       readColorLoopStoredEnhancedHueAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorCapabilitiesAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorCapabilitiesAttribute(IntegerAttributeCallback callback) {
       readColorCapabilitiesAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTempPhysicalMinAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorTempPhysicalMinAttribute(IntegerAttributeCallback callback) {
       readColorTempPhysicalMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readColorTempPhysicalMaxAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readColorTempPhysicalMaxAttribute(IntegerAttributeCallback callback) {
       readColorTempPhysicalMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readCoupleColorTempToLevelMinMiredsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCoupleColorTempToLevelMinMiredsAttribute(IntegerAttributeCallback callback) {
       readCoupleColorTempToLevelMinMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void readStartUpColorTemperatureMiredsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStartUpColorTemperatureMiredsAttribute(IntegerAttributeCallback callback) {
       readStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback);
     }
 
-    public void writeStartUpColorTemperatureMiredsAttribute(DefaultClusterCallback callback, int value) {
+    public void writeStartUpColorTemperatureMiredsAttribute(
+        DefaultClusterCallback callback, int value) {
       writeStartUpColorTemperatureMiredsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readCurrentHueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeCurrentHueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readCurrentHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentHueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readCurrentSaturationAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeCurrentHueAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCurrentSaturationAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportCurrentHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentSaturationAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readRemainingTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentXAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentSaturationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentSaturationAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportCurrentXAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readCurrentYAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportCurrentSaturationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentYAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readDriftCompensationAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCompensationTextAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readColorTemperatureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeColorTemperatureAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentXAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportColorTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readColorModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorControlOptionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportCurrentXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorControlOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readNumberOfPrimariesAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary1XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary1YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary1IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary2XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary2YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary2IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary3XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary3YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary3IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary4XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary4YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary4IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary5XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary5YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary5IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary6XAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary6YAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPrimary6IntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readWhitePointXAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeWhitePointXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readWhitePointYAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeCurrentYAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void writeWhitePointYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointRXAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportCurrentYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointRXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointRYAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readDriftCompensationAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointRYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointRIntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCompensationTextAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
 
-    private native void writeColorPointRIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointGXAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readColorTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointGXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointGYAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeColorTemperatureAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void writeColorPointGYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointGIntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportColorTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointGIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointBXAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readColorModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointBXAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointBYAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readColorControlOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeColorPointBYAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readColorPointBIntensityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeColorControlOptionsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeColorPointBIntensityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readEnhancedCurrentHueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readEnhancedColorModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorLoopActiveAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorLoopDirectionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorLoopTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorLoopStartEnhancedHueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorLoopStoredEnhancedHueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorCapabilitiesAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorTempPhysicalMinAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readColorTempPhysicalMaxAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCoupleColorTempToLevelMinMiredsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readStartUpColorTemperatureMiredsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readNumberOfPrimariesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeStartUpColorTemperatureMiredsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  }
+    private native void readPrimary1XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-  public static class ContentLauncherCluster extends BaseChipCluster {
-    public ContentLauncherCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void readPrimary1YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public static long clusterId() {
-      return Long.parseUnsignedLong("1290");
-    }
+    private native void readPrimary1IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
+    private native void readPrimary2XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void launchContent(LaunchContentResponseCallback callback, boolean autoPlay, String data) {
-      launchContent(chipClusterPtr, callback, autoPlay, data);
-    }
+    private native void readPrimary2YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
+    private native void readPrimary2IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void launchURL(LaunchURLResponseCallback callback, String contentURL, String displayString) {
-      launchURL(chipClusterPtr, callback, contentURL, displayString);
-    }
+    private native void readPrimary3XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void launchContent(long chipClusterPtr, LaunchContentResponseCallback callback, boolean autoPlay, String data);
-    private native void launchURL(long chipClusterPtr, LaunchURLResponseCallback callback, String contentURL, String displayString);
-    public interface LaunchContentResponseCallback {
-      void onSuccess(
-      String data
-      , int contentLaunchStatus
-      );
-      
-      void onError(Exception error);
-    }
+    private native void readPrimary3YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public interface LaunchURLResponseCallback {
-      void onSuccess(
-      String data
-      , int contentLaunchStatus
-      );
-      
-      void onError(Exception error);
-    }
+    private native void readPrimary3IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
+    private native void readPrimary4XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
+    private native void readPrimary4YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public interface AcceptsHeaderListAttributeCallback {
-      void onSuccess(List<
-        byte[]
-      > valueList);
-      void onError(Exception ex);
-    }
+    private native void readPrimary4IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public interface SupportedStreamingTypesAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
-      void onError(Exception ex);
-    }
+    private native void readPrimary5XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readAcceptsHeaderListAttribute(
-      AcceptsHeaderListAttributeCallback callback
-    ) {
-      readAcceptsHeaderListAttribute(chipClusterPtr, callback);
-    }
+    private native void readPrimary5YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readSupportedStreamingTypesAttribute(
-      SupportedStreamingTypesAttributeCallback callback
-    ) {
-      readSupportedStreamingTypesAttribute(chipClusterPtr, callback);
-    }
+    private native void readPrimary5IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-  
-    private native void readAcceptsHeaderListAttribute(long chipClusterPtr,
-      AcceptsHeaderListAttributeCallback callback
-    );
-  
-    private native void readSupportedStreamingTypesAttribute(long chipClusterPtr,
-      SupportedStreamingTypesAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  }
+    private native void readPrimary6XAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-  public static class DescriptorCluster extends BaseChipCluster {
-    public DescriptorCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void readPrimary6YAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    public static long clusterId() {
-      return Long.parseUnsignedLong("29");
-    }
+    private native void readPrimary6IntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readWhitePointXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeWhitePointXAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readWhitePointYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeWhitePointYAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointRXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointRXAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointRYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointRYAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointRIntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointRIntensityAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointGXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointGXAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointGYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointGYAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointGIntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointGIntensityAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointBXAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointBXAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointBYAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointBYAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readColorPointBIntensityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeColorPointBIntensityAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readEnhancedCurrentHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readEnhancedColorModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorLoopActiveAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorLoopDirectionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorLoopTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorLoopStartEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorLoopStoredEnhancedHueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorCapabilitiesAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorTempPhysicalMinAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readColorTempPhysicalMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCoupleColorTempToLevelMinMiredsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readStartUpColorTemperatureMiredsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeStartUpColorTemperatureMiredsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+  }
+
+  public static class ContentLauncherCluster extends BaseChipCluster {
+    public ContentLauncherCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    public static long clusterId() {
+      return Long.parseUnsignedLong("1290");
+    }
+
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
+
+    public void launchContent(
+        LaunchContentResponseCallback callback, boolean autoPlay, String data) {
+      launchContent(chipClusterPtr, callback, autoPlay, data);
+    }
+
+    public void launchURL(
+        LaunchURLResponseCallback callback, String contentURL, String displayString) {
+      launchURL(chipClusterPtr, callback, contentURL, displayString);
+    }
+
+    private native void launchContent(
+        long chipClusterPtr, LaunchContentResponseCallback callback, boolean autoPlay, String data);
+
+    private native void launchURL(
+        long chipClusterPtr,
+        LaunchURLResponseCallback callback,
+        String contentURL,
+        String displayString);
+
+    public interface LaunchContentResponseCallback {
+      void onSuccess(String data, int contentLaunchStatus);
+
+      void onError(Exception error);
+    }
+
+    public interface LaunchURLResponseCallback {
+      void onSuccess(String data, int contentLaunchStatus);
+
+      void onError(Exception error);
+    }
+
+    public interface AcceptsHeaderListAttributeCallback {
+      void onSuccess(List<byte[]> valueList);
+
+      void onError(Exception ex);
+    }
+
+    public interface SupportedStreamingTypesAttributeCallback {
+      void onSuccess(List<Integer> valueList);
+
+      void onError(Exception ex);
+    }
+
+    public void readAcceptsHeaderListAttribute(AcceptsHeaderListAttributeCallback callback) {
+      readAcceptsHeaderListAttribute(chipClusterPtr, callback);
+    }
+
+    public void readSupportedStreamingTypesAttribute(
+        SupportedStreamingTypesAttributeCallback callback) {
+      readSupportedStreamingTypesAttribute(chipClusterPtr, callback);
+    }
+
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    private native void readAcceptsHeaderListAttribute(
+        long chipClusterPtr, AcceptsHeaderListAttributeCallback callback);
+
+    private native void readSupportedStreamingTypesAttribute(
+        long chipClusterPtr, SupportedStreamingTypesAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+  }
+
+  public static class DescriptorCluster extends BaseChipCluster {
+    public DescriptorCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
+
+    public static long clusterId() {
+      return Long.parseUnsignedLong("29");
+    }
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
     public static class DeviceListAttribute {
       public long type;
-            public int revision;
-      
-      public DeviceListAttribute(
-        long type,
-                int revision
-              ) {
+      public int revision;
+
+      public DeviceListAttribute(long type, int revision) {
         this.type = type;
         this.revision = revision;
       }
     }
 
     public interface DeviceListAttributeCallback {
-      void onSuccess(List<
-      DeviceListAttribute
-      > valueList);
+      void onSuccess(List<DeviceListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
     public interface ServerListAttributeCallback {
-      void onSuccess(List<
-        Long
-              > valueList);
+      void onSuccess(List<Long> valueList);
+
       void onError(Exception ex);
     }
 
     public interface ClientListAttributeCallback {
-      void onSuccess(List<
-        Long
-              > valueList);
+      void onSuccess(List<Long> valueList);
+
       void onError(Exception ex);
     }
 
     public interface PartsListAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
+      void onSuccess(List<Integer> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readDeviceListAttribute(
-      DeviceListAttributeCallback callback
-    ) {
+    public void readDeviceListAttribute(DeviceListAttributeCallback callback) {
       readDeviceListAttribute(chipClusterPtr, callback);
     }
 
-    public void readServerListAttribute(
-      ServerListAttributeCallback callback
-    ) {
+    public void readServerListAttribute(ServerListAttributeCallback callback) {
       readServerListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClientListAttribute(
-      ClientListAttributeCallback callback
-    ) {
+    public void readClientListAttribute(ClientListAttributeCallback callback) {
       readClientListAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartsListAttribute(
-      PartsListAttributeCallback callback
-    ) {
+    public void readPartsListAttribute(PartsListAttributeCallback callback) {
       readPartsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readDeviceListAttribute(long chipClusterPtr,
-      DeviceListAttributeCallback callback
-    );
-  
-    private native void readServerListAttribute(long chipClusterPtr,
-      ServerListAttributeCallback callback
-    );
-  
-    private native void readClientListAttribute(long chipClusterPtr,
-      ClientListAttributeCallback callback
-    );
-  
-    private native void readPartsListAttribute(long chipClusterPtr,
-      PartsListAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readDeviceListAttribute(
+        long chipClusterPtr, DeviceListAttributeCallback callback);
+
+    private native void readServerListAttribute(
+        long chipClusterPtr, ServerListAttributeCallback callback);
+
+    private native void readClientListAttribute(
+        long chipClusterPtr, ClientListAttributeCallback callback);
+
+    private native void readPartsListAttribute(
+        long chipClusterPtr, PartsListAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class DiagnosticLogsCluster extends BaseChipCluster {
@@ -2245,6 +2268,7 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+<<<<<<< HEAD
     public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, int intent, int requestedProtocol, byte[] transferFileDesignator) {
       retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator);
     }
@@ -2262,6 +2286,23 @@ void onSuccess(
     }
 
 
+=======
+    public void retrieveLogsRequest(
+        DefaultClusterCallback callback,
+        int intent,
+        int requestedProtocol,
+        byte[] transferFileDesignator) {
+      retrieveLogsRequest(
+          chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator);
+    }
+
+    private native void retrieveLogsRequest(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int intent,
+        int requestedProtocol,
+        byte[] transferFileDesignator);
+>>>>>>> b8d7ee0e3 (callback generation done)
   }
 
   public static class DoorLockCluster extends BaseChipCluster {
@@ -2272,7 +2313,7 @@ public DoorLockCluster(long devicePtr, int endpointId) {
     public static long clusterId() {
       return Long.parseUnsignedLong("257");
     }
-
+    src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
@@ -2280,360 +2321,409 @@ public void clearAllPins(ClearAllPinsResponseCallback callback) {
       clearAllPins(chipClusterPtr, callback);
     }
 
-
     public void clearAllRfids(ClearAllRfidsResponseCallback callback) {
       clearAllRfids(chipClusterPtr, callback);
     }
 
-
-    public void clearHolidaySchedule(ClearHolidayScheduleResponseCallback callback, int scheduleId) {
+    public void clearHolidaySchedule(
+        ClearHolidayScheduleResponseCallback callback, int scheduleId) {
       clearHolidaySchedule(chipClusterPtr, callback, scheduleId);
     }
 
-
     public void clearPin(ClearPinResponseCallback callback, int userId) {
       clearPin(chipClusterPtr, callback, userId);
     }
 
-
     public void clearRfid(ClearRfidResponseCallback callback, int userId) {
       clearRfid(chipClusterPtr, callback, userId);
     }
 
-
-    public void clearWeekdaySchedule(ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
+    public void clearWeekdaySchedule(
+        ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
       clearWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-
-    public void clearYeardaySchedule(ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
+    public void clearYeardaySchedule(
+        ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
       clearYeardaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-
     public void getHolidaySchedule(GetHolidayScheduleResponseCallback callback, int scheduleId) {
       getHolidaySchedule(chipClusterPtr, callback, scheduleId);
     }
 
-
     public void getLogRecord(GetLogRecordResponseCallback callback, int logIndex) {
       getLogRecord(chipClusterPtr, callback, logIndex);
     }
 
-
     public void getPin(GetPinResponseCallback callback, int userId) {
       getPin(chipClusterPtr, callback, userId);
     }
 
-
     public void getRfid(GetRfidResponseCallback callback, int userId) {
       getRfid(chipClusterPtr, callback, userId);
     }
 
-
     public void getUserType(GetUserTypeResponseCallback callback, int userId) {
       getUserType(chipClusterPtr, callback, userId);
     }
 
-
-    public void getWeekdaySchedule(GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
+    public void getWeekdaySchedule(
+        GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId) {
       getWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-
-    public void getYeardaySchedule(GetYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
+    public void getYeardaySchedule(
+        GetYeardayScheduleResponseCallback callback, int scheduleId, int userId) {
       getYeardaySchedule(chipClusterPtr, callback, scheduleId, userId);
     }
 
-
     public void lockDoor(LockDoorResponseCallback callback, byte[] pin) {
       lockDoor(chipClusterPtr, callback, pin);
     }
 
-
-    public void setHolidaySchedule(SetHolidayScheduleResponseCallback callback, int scheduleId, long localStartTime, long localEndTime, int operatingModeDuringHoliday) {
-      setHolidaySchedule(chipClusterPtr, callback, scheduleId, localStartTime, localEndTime, operatingModeDuringHoliday);
+    public void setHolidaySchedule(
+        SetHolidayScheduleResponseCallback callback,
+        int scheduleId,
+        long localStartTime,
+        long localEndTime,
+        int operatingModeDuringHoliday) {
+      setHolidaySchedule(
+          chipClusterPtr,
+          callback,
+          scheduleId,
+          localStartTime,
+          localEndTime,
+          operatingModeDuringHoliday);
     }
 
-
-    public void setPin(SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin) {
+    public void setPin(
+        SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin) {
       setPin(chipClusterPtr, callback, userId, userStatus, userType, pin);
     }
 
-
-    public void setRfid(SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id) {
+    public void setRfid(
+        SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id) {
       setRfid(chipClusterPtr, callback, userId, userStatus, userType, id);
     }
 
-
     public void setUserType(SetUserTypeResponseCallback callback, int userId, int userType) {
       setUserType(chipClusterPtr, callback, userId, userType);
     }
 
-
-    public void setWeekdaySchedule(SetWeekdayScheduleResponseCallback callback, int scheduleId, int userId, int daysMask, int startHour, int startMinute, int endHour, int endMinute) {
-      setWeekdaySchedule(chipClusterPtr, callback, scheduleId, userId, daysMask, startHour, startMinute, endHour, endMinute);
+    public void setWeekdaySchedule(
+        SetWeekdayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId,
+        int daysMask,
+        int startHour,
+        int startMinute,
+        int endHour,
+        int endMinute) {
+      setWeekdaySchedule(
+          chipClusterPtr,
+          callback,
+          scheduleId,
+          userId,
+          daysMask,
+          startHour,
+          startMinute,
+          endHour,
+          endMinute);
     }
 
-
-    public void setYeardaySchedule(SetYeardayScheduleResponseCallback callback, int scheduleId, int userId, long localStartTime, long localEndTime) {
-      setYeardaySchedule(chipClusterPtr, callback, scheduleId, userId, localStartTime, localEndTime);
+    public void setYeardaySchedule(
+        SetYeardayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId,
+        long localStartTime,
+        long localEndTime) {
+      setYeardaySchedule(
+          chipClusterPtr, callback, scheduleId, userId, localStartTime, localEndTime);
     }
 
-
     public void unlockDoor(UnlockDoorResponseCallback callback, byte[] pin) {
       unlockDoor(chipClusterPtr, callback, pin);
     }
 
-
-    public void unlockWithTimeout(UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin) {
+    public void unlockWithTimeout(
+        UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin) {
       unlockWithTimeout(chipClusterPtr, callback, timeoutInSeconds, pin);
     }
 
     private native void clearAllPins(long chipClusterPtr, ClearAllPinsResponseCallback callback);
+
     private native void clearAllRfids(long chipClusterPtr, ClearAllRfidsResponseCallback callback);
-    private native void clearHolidaySchedule(long chipClusterPtr, ClearHolidayScheduleResponseCallback callback, int scheduleId);
-    private native void clearPin(long chipClusterPtr, ClearPinResponseCallback callback, int userId);
-    private native void clearRfid(long chipClusterPtr, ClearRfidResponseCallback callback, int userId);
-    private native void clearWeekdaySchedule(long chipClusterPtr, ClearWeekdayScheduleResponseCallback callback, int scheduleId, int userId);
-    private native void clearYeardaySchedule(long chipClusterPtr, ClearYeardayScheduleResponseCallback callback, int scheduleId, int userId);
-    private native void getHolidaySchedule(long chipClusterPtr, GetHolidayScheduleResponseCallback callback, int scheduleId);
-    private native void getLogRecord(long chipClusterPtr, GetLogRecordResponseCallback callback, int logIndex);
+
+    private native void clearHolidaySchedule(
+        long chipClusterPtr, ClearHolidayScheduleResponseCallback callback, int scheduleId);
+
+    private native void clearPin(
+        long chipClusterPtr, ClearPinResponseCallback callback, int userId);
+
+    private native void clearRfid(
+        long chipClusterPtr, ClearRfidResponseCallback callback, int userId);
+
+    private native void clearWeekdaySchedule(
+        long chipClusterPtr,
+        ClearWeekdayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId);
+
+    private native void clearYeardaySchedule(
+        long chipClusterPtr,
+        ClearYeardayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId);
+
+    private native void getHolidaySchedule(
+        long chipClusterPtr, GetHolidayScheduleResponseCallback callback, int scheduleId);
+
+    private native void getLogRecord(
+        long chipClusterPtr, GetLogRecordResponseCallback callback, int logIndex);
+
     private native void getPin(long chipClusterPtr, GetPinResponseCallback callback, int userId);
+
     private native void getRfid(long chipClusterPtr, GetRfidResponseCallback callback, int userId);
-    private native void getUserType(long chipClusterPtr, GetUserTypeResponseCallback callback, int userId);
-    private native void getWeekdaySchedule(long chipClusterPtr, GetWeekdayScheduleResponseCallback callback, int scheduleId, int userId);
-    private native void getYeardaySchedule(long chipClusterPtr, GetYeardayScheduleResponseCallback callback, int scheduleId, int userId);
-    private native void lockDoor(long chipClusterPtr, LockDoorResponseCallback callback, byte[] pin);
-    private native void setHolidaySchedule(long chipClusterPtr, SetHolidayScheduleResponseCallback callback, int scheduleId, long localStartTime, long localEndTime, int operatingModeDuringHoliday);
-    private native void setPin(long chipClusterPtr, SetPinResponseCallback callback, int userId, int userStatus, int userType, byte[] pin);
-    private native void setRfid(long chipClusterPtr, SetRfidResponseCallback callback, int userId, int userStatus, int userType, byte[] id);
-    private native void setUserType(long chipClusterPtr, SetUserTypeResponseCallback callback, int userId, int userType);
-    private native void setWeekdaySchedule(long chipClusterPtr, SetWeekdayScheduleResponseCallback callback, int scheduleId, int userId, int daysMask, int startHour, int startMinute, int endHour, int endMinute);
-    private native void setYeardaySchedule(long chipClusterPtr, SetYeardayScheduleResponseCallback callback, int scheduleId, int userId, long localStartTime, long localEndTime);
-    private native void unlockDoor(long chipClusterPtr, UnlockDoorResponseCallback callback, byte[] pin);
-    private native void unlockWithTimeout(long chipClusterPtr, UnlockWithTimeoutResponseCallback callback, int timeoutInSeconds, byte[] pin);
+
+    private native void getUserType(
+        long chipClusterPtr, GetUserTypeResponseCallback callback, int userId);
+
+    private native void getWeekdaySchedule(
+        long chipClusterPtr,
+        GetWeekdayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId);
+
+    private native void getYeardaySchedule(
+        long chipClusterPtr,
+        GetYeardayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId);
+
+    private native void lockDoor(
+        long chipClusterPtr, LockDoorResponseCallback callback, byte[] pin);
+
+    private native void setHolidaySchedule(
+        long chipClusterPtr,
+        SetHolidayScheduleResponseCallback callback,
+        int scheduleId,
+        long localStartTime,
+        long localEndTime,
+        int operatingModeDuringHoliday);
+
+    private native void setPin(
+        long chipClusterPtr,
+        SetPinResponseCallback callback,
+        int userId,
+        int userStatus,
+        int userType,
+        byte[] pin);
+
+    private native void setRfid(
+        long chipClusterPtr,
+        SetRfidResponseCallback callback,
+        int userId,
+        int userStatus,
+        int userType,
+        byte[] id);
+
+    private native void setUserType(
+        long chipClusterPtr, SetUserTypeResponseCallback callback, int userId, int userType);
+
+    private native void setWeekdaySchedule(
+        long chipClusterPtr,
+        SetWeekdayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId,
+        int daysMask,
+        int startHour,
+        int startMinute,
+        int endHour,
+        int endMinute);
+
+    private native void setYeardaySchedule(
+        long chipClusterPtr,
+        SetYeardayScheduleResponseCallback callback,
+        int scheduleId,
+        int userId,
+        long localStartTime,
+        long localEndTime);
+
+    private native void unlockDoor(
+        long chipClusterPtr, UnlockDoorResponseCallback callback, byte[] pin);
+
+    private native void unlockWithTimeout(
+        long chipClusterPtr,
+        UnlockWithTimeoutResponseCallback callback,
+        int timeoutInSeconds,
+        byte[] pin);
+
     public interface ClearAllPinsResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearAllRfidsResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearHolidayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearPinResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearRfidResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearWeekdayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface ClearYeardayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface GetHolidayScheduleResponseCallback {
       void onSuccess(
-      int scheduleId
-      , int status
-      , long localStartTime
-      , long localEndTime
-      , int operatingModeDuringHoliday
-      );
-      
+          int scheduleId,
+          int status,
+          long localStartTime,
+          long localEndTime,
+          int operatingModeDuringHoliday);
+
       void onError(Exception error);
     }
 
     public interface GetLogRecordResponseCallback {
       void onSuccess(
-      int logEntryId
-      , long timestamp
-      , int eventType
-      , int source
-      , int eventIdOrAlarmCode
-      , int userId
-      , byte[] pin
-      );
-      
+          int logEntryId,
+          long timestamp,
+          int eventType,
+          int source,
+          int eventIdOrAlarmCode,
+          int userId,
+          byte[] pin);
+
       void onError(Exception error);
     }
 
     public interface GetPinResponseCallback {
-      void onSuccess(
-      int userId
-      , int userStatus
-      , int userType
-      , byte[] pin
-      );
-      
+      void onSuccess(int userId, int userStatus, int userType, byte[] pin);
+
       void onError(Exception error);
     }
 
     public interface GetRfidResponseCallback {
-      void onSuccess(
-      int userId
-      , int userStatus
-      , int userType
-      , byte[] rfid
-      );
-      
+      void onSuccess(int userId, int userStatus, int userType, byte[] rfid);
+
       void onError(Exception error);
     }
 
     public interface GetUserTypeResponseCallback {
-      void onSuccess(
-      int userId
-      , int userType
-      );
-      
+      void onSuccess(int userId, int userType);
+
       void onError(Exception error);
     }
 
     public interface GetWeekdayScheduleResponseCallback {
       void onSuccess(
-      int scheduleId
-      , int userId
-      , int status
-      , int daysMask
-      , int startHour
-      , int startMinute
-      , int endHour
-      , int endMinute
-      );
-      
+          int scheduleId,
+          int userId,
+          int status,
+          int daysMask,
+          int startHour,
+          int startMinute,
+          int endHour,
+          int endMinute);
+
       void onError(Exception error);
     }
 
     public interface GetYeardayScheduleResponseCallback {
       void onSuccess(
-      int scheduleId
-      , int userId
-      , int status
-      , long localStartTime
-      , long localEndTime
-      );
-      
+          int scheduleId, int userId, int status, long localStartTime, long localEndTime);
+
       void onError(Exception error);
     }
 
     public interface LockDoorResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetHolidayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetPinResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetRfidResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetUserTypeResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetWeekdayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface SetYeardayScheduleResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface UnlockDoorResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
     public interface UnlockWithTimeoutResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
-
-
-    public void readLockStateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readLockStateAttribute(IntegerAttributeCallback callback) {
       readLockStateAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLockStateAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeLockStateAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeLockStateAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -2641,43 +2731,35 @@ public void reportLockStateAttribute(IntegerAttributeCallback callback) {
       reportLockStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readLockTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readLockTypeAttribute(IntegerAttributeCallback callback) {
       readLockTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readActuatorEnabledAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readActuatorEnabledAttribute(BooleanAttributeCallback callback) {
       readActuatorEnabledAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readLockStateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeLockStateAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readLockStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeLockStateAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportLockStateAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readLockTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readActuatorEnabledAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportLockStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readLockTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readActuatorEnabledAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class ElectricalMeasurementCluster extends BaseChipCluster {
@@ -2692,126 +2774,89 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMeasurementTypeAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readMeasurementTypeAttribute(LongAttributeCallback callback) {
       readMeasurementTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readTotalActivePowerAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTotalActivePowerAttribute(LongAttributeCallback callback) {
       readTotalActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsVoltageAttribute(IntegerAttributeCallback callback) {
       readRmsVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageMinAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsVoltageMinAttribute(IntegerAttributeCallback callback) {
       readRmsVoltageMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsVoltageMaxAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsVoltageMaxAttribute(IntegerAttributeCallback callback) {
       readRmsVoltageMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsCurrentAttribute(IntegerAttributeCallback callback) {
       readRmsCurrentAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentMinAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsCurrentMinAttribute(IntegerAttributeCallback callback) {
       readRmsCurrentMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readRmsCurrentMaxAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRmsCurrentMaxAttribute(IntegerAttributeCallback callback) {
       readRmsCurrentMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readActivePowerAttribute(IntegerAttributeCallback callback) {
       readActivePowerAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerMinAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readActivePowerMinAttribute(IntegerAttributeCallback callback) {
       readActivePowerMinAttribute(chipClusterPtr, callback);
     }
 
-    public void readActivePowerMaxAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readActivePowerMaxAttribute(IntegerAttributeCallback callback) {
       readActivePowerMaxAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readMeasurementTypeAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTotalActivePowerAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRmsVoltageAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRmsVoltageMinAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRmsVoltageMaxAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRmsCurrentAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRmsCurrentMinAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRmsCurrentMaxAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readActivePowerAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readActivePowerMinAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readActivePowerMaxAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readMeasurementTypeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTotalActivePowerAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRmsVoltageAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRmsVoltageMinAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRmsVoltageMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRmsCurrentAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRmsCurrentMinAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRmsCurrentMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readActivePowerAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readActivePowerMinAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readActivePowerMaxAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class EthernetNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -2832,106 +2877,75 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback);
 
-
-    public void readPHYRateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPHYRateAttribute(IntegerAttributeCallback callback) {
       readPHYRateAttribute(chipClusterPtr, callback);
     }
 
-    public void readFullDuplexAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readFullDuplexAttribute(BooleanAttributeCallback callback) {
       readFullDuplexAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketRxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketRxCountAttribute(LongAttributeCallback callback) {
       readPacketRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketTxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketTxCountAttribute(LongAttributeCallback callback) {
       readPacketTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxErrCountAttribute(LongAttributeCallback callback) {
       readTxErrCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCollisionCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readCollisionCountAttribute(LongAttributeCallback callback) {
       readCollisionCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCarrierDetectAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readCarrierDetectAttribute(BooleanAttributeCallback callback) {
       readCarrierDetectAttribute(chipClusterPtr, callback);
     }
 
-    public void readTimeSinceResetAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTimeSinceResetAttribute(LongAttributeCallback callback) {
       readTimeSinceResetAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readPHYRateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readFullDuplexAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readPacketRxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPacketTxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxErrCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readCollisionCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readOverrunCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readCarrierDetectAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readTimeSinceResetAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readPHYRateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readFullDuplexAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readPacketRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPacketTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxErrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readCollisionCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readCarrierDetectAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readTimeSinceResetAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class FixedLabelCluster extends BaseChipCluster {
@@ -2950,41 +2964,38 @@ public static class LabelListAttribute {
       public String label;
       public String value;
 
+<<<<<<< HEAD
       public LabelListAttribute(
         String label,
         String value
       ) {
+=======
+      public LabelListAttribute(byte[] label, byte[] value) {
+>>>>>>> e993d01f0 (callback generation done)
         this.label = label;
         this.value = value;
       }
     }
 
     public interface LabelListAttributeCallback {
-      void onSuccess(List<
-      LabelListAttribute
-      > valueList);
+      void onSuccess(List<LabelListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readLabelListAttribute(
-      LabelListAttributeCallback callback
-    ) {
+    public void readLabelListAttribute(LabelListAttributeCallback callback) {
       readLabelListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readLabelListAttribute(long chipClusterPtr,
-      LabelListAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readLabelListAttribute(
+        long chipClusterPtr, LabelListAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class FlowMeasurementCluster extends BaseChipCluster {
@@ -2999,25 +3010,19 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
@@ -3064,6 +3069,23 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class GeneralCommissioningCluster extends BaseChipCluster {
@@ -3078,71 +3100,78 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void armFailSafe(ArmFailSafeResponseCallback callback, int expiryLengthSeconds, long breadcrumb, long timeoutMs) {
+    public void armFailSafe(
+        ArmFailSafeResponseCallback callback,
+        int expiryLengthSeconds,
+        long breadcrumb,
+        long timeoutMs) {
       armFailSafe(chipClusterPtr, callback, expiryLengthSeconds, breadcrumb, timeoutMs);
     }
 
-
     public void commissioningComplete(CommissioningCompleteResponseCallback callback) {
       commissioningComplete(chipClusterPtr, callback);
     }
 
-
-    public void setRegulatoryConfig(SetRegulatoryConfigResponseCallback callback, int location, String countryCode, long breadcrumb, long timeoutMs) {
+    public void setRegulatoryConfig(
+        SetRegulatoryConfigResponseCallback callback,
+        int location,
+        String countryCode,
+        long breadcrumb,
+        long timeoutMs) {
       setRegulatoryConfig(chipClusterPtr, callback, location, countryCode, breadcrumb, timeoutMs);
     }
 
-    private native void armFailSafe(long chipClusterPtr, ArmFailSafeResponseCallback callback, int expiryLengthSeconds, long breadcrumb, long timeoutMs);
-    private native void commissioningComplete(long chipClusterPtr, CommissioningCompleteResponseCallback callback);
-    private native void setRegulatoryConfig(long chipClusterPtr, SetRegulatoryConfigResponseCallback callback, int location, String countryCode, long breadcrumb, long timeoutMs);
+    private native void armFailSafe(
+        long chipClusterPtr,
+        ArmFailSafeResponseCallback callback,
+        int expiryLengthSeconds,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void commissioningComplete(
+        long chipClusterPtr, CommissioningCompleteResponseCallback callback);
+
+    private native void setRegulatoryConfig(
+        long chipClusterPtr,
+        SetRegulatoryConfigResponseCallback callback,
+        int location,
+        String countryCode,
+        long breadcrumb,
+        long timeoutMs);
+
     public interface ArmFailSafeResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface CommissioningCompleteResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface SetRegulatoryConfigResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
-
     public static class BasicCommissioningInfoListAttribute {
       public long failSafeExpiryLengthMs;
-      
-      public BasicCommissioningInfoListAttribute(
-        long failSafeExpiryLengthMs
-              ) {
+
+      public BasicCommissioningInfoListAttribute(long failSafeExpiryLengthMs) {
         this.failSafeExpiryLengthMs = failSafeExpiryLengthMs;
       }
     }
 
     public interface BasicCommissioningInfoListAttributeCallback {
-      void onSuccess(List<
-      BasicCommissioningInfoListAttribute
-      > valueList);
+      void onSuccess(List<BasicCommissioningInfoListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readBreadcrumbAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBreadcrumbAttribute(LongAttributeCallback callback) {
       readBreadcrumbAttribute(chipClusterPtr, callback);
     }
 
@@ -3151,30 +3180,25 @@ public void writeBreadcrumbAttribute(DefaultClusterCallback callback, long value
     }
 
     public void readBasicCommissioningInfoListAttribute(
-      BasicCommissioningInfoListAttributeCallback callback
-    ) {
+        BasicCommissioningInfoListAttributeCallback callback) {
       readBasicCommissioningInfoListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readBreadcrumbAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
 
-    private native void writeBreadcrumbAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readBasicCommissioningInfoListAttribute(long chipClusterPtr,
-      BasicCommissioningInfoListAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readBreadcrumbAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void writeBreadcrumbAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, long value);
+
+    private native void readBasicCommissioningInfoListAttribute(
+        long chipClusterPtr, BasicCommissioningInfoListAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class GeneralDiagnosticsCluster extends BaseChipCluster {
@@ -3192,12 +3216,13 @@ public static long clusterId() {
     public static class NetworkInterfacesAttribute {
       public String name;
       public boolean fabricConnected;
-            public boolean offPremiseServicesReachableIPv4;
-            public boolean offPremiseServicesReachableIPv6;
-            public byte[] hardwareAddress;
+      public boolean offPremiseServicesReachableIPv4;
+      public boolean offPremiseServicesReachableIPv6;
+      public byte[] hardwareAddress;
       public int type;
-      
+
       public NetworkInterfacesAttribute(
+<<<<<<< HEAD
         String name,
         boolean fabricConnected,
                 boolean offPremiseServicesReachableIPv4,
@@ -3205,6 +3230,14 @@ public NetworkInterfacesAttribute(
                 byte[] hardwareAddress,
         int type
               ) {
+=======
+          byte[] name,
+          boolean fabricConnected,
+          boolean offPremiseServicesReachableIPv4,
+          boolean offPremiseServicesReachableIPv6,
+          byte[] hardwareAddress,
+          int type) {
+>>>>>>> e993d01f0 (callback generation done)
         this.name = name;
         this.fabricConnected = fabricConnected;
         this.offPremiseServicesReachableIPv4 = offPremiseServicesReachableIPv4;
@@ -3215,71 +3248,51 @@ public NetworkInterfacesAttribute(
     }
 
     public interface NetworkInterfacesAttributeCallback {
-      void onSuccess(List<
-      NetworkInterfacesAttribute
-      > valueList);
+      void onSuccess(List<NetworkInterfacesAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readNetworkInterfacesAttribute(
-      NetworkInterfacesAttributeCallback callback
-    ) {
+    public void readNetworkInterfacesAttribute(NetworkInterfacesAttributeCallback callback) {
       readNetworkInterfacesAttribute(chipClusterPtr, callback);
     }
 
-    public void readRebootCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRebootCountAttribute(IntegerAttributeCallback callback) {
       readRebootCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readUpTimeAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readUpTimeAttribute(LongAttributeCallback callback) {
       readUpTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readTotalOperationalHoursAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTotalOperationalHoursAttribute(LongAttributeCallback callback) {
       readTotalOperationalHoursAttribute(chipClusterPtr, callback);
     }
 
-    public void readBootReasonsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBootReasonsAttribute(IntegerAttributeCallback callback) {
       readBootReasonsAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readNetworkInterfacesAttribute(long chipClusterPtr,
-      NetworkInterfacesAttributeCallback callback
-    );
-  
-    private native void readRebootCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readUpTimeAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTotalOperationalHoursAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readBootReasonsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readNetworkInterfacesAttribute(
+        long chipClusterPtr, NetworkInterfacesAttributeCallback callback);
+
+    private native void readRebootCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readUpTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTotalOperationalHoursAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readBootReasonsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class GroupKeyManagementCluster extends BaseChipCluster {
@@ -3296,14 +3309,10 @@ public static long clusterId() {
 
     public static class GroupsAttribute {
       public int vendorId;
-            public int vendorGroupId;
-            public int groupKeySetIndex;
-      
-      public GroupsAttribute(
-        int vendorId,
-                int vendorGroupId,
-                int groupKeySetIndex
-              ) {
+      public int vendorGroupId;
+      public int groupKeySetIndex;
+
+      public GroupsAttribute(int vendorId, int vendorGroupId, int groupKeySetIndex) {
         this.vendorId = vendorId;
         this.vendorGroupId = vendorGroupId;
         this.groupKeySetIndex = groupKeySetIndex;
@@ -3311,25 +3320,24 @@ public GroupsAttribute(
     }
 
     public interface GroupsAttributeCallback {
-      void onSuccess(List<
-      GroupsAttribute
-      > valueList);
+      void onSuccess(List<GroupsAttribute> valueList);
+
       void onError(Exception ex);
     }
+
     public static class GroupKeysAttribute {
       public int vendorId;
-            public int groupKeyIndex;
-            public byte[] groupKeyRoot;
+      public int groupKeyIndex;
+      public byte[] groupKeyRoot;
       public long groupKeyEpochStartTime;
-            public int groupKeySecurityPolicy;
-      
+      public int groupKeySecurityPolicy;
+
       public GroupKeysAttribute(
-        int vendorId,
-                int groupKeyIndex,
-                byte[] groupKeyRoot,
-        long groupKeyEpochStartTime,
-                int groupKeySecurityPolicy
-              ) {
+          int vendorId,
+          int groupKeyIndex,
+          byte[] groupKeyRoot,
+          long groupKeyEpochStartTime,
+          int groupKeySecurityPolicy) {
         this.vendorId = vendorId;
         this.groupKeyIndex = groupKeyIndex;
         this.groupKeyRoot = groupKeyRoot;
@@ -3339,41 +3347,30 @@ public GroupKeysAttribute(
     }
 
     public interface GroupKeysAttributeCallback {
-      void onSuccess(List<
-      GroupKeysAttribute
-      > valueList);
+      void onSuccess(List<GroupKeysAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readGroupsAttribute(
-      GroupsAttributeCallback callback
-    ) {
+    public void readGroupsAttribute(GroupsAttributeCallback callback) {
       readGroupsAttribute(chipClusterPtr, callback);
     }
 
-    public void readGroupKeysAttribute(
-      GroupKeysAttributeCallback callback
-    ) {
+    public void readGroupKeysAttribute(GroupKeysAttributeCallback callback) {
       readGroupKeysAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readGroupsAttribute(long chipClusterPtr,
-      GroupsAttributeCallback callback
-    );
-  
-    private native void readGroupKeysAttribute(long chipClusterPtr,
-      GroupKeysAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readGroupsAttribute(long chipClusterPtr, GroupsAttributeCallback callback);
+
+    private native void readGroupKeysAttribute(
+        long chipClusterPtr, GroupKeysAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class GroupsCluster extends BaseChipCluster {
@@ -3392,97 +3389,88 @@ public void addGroup(AddGroupResponseCallback callback, int groupId, String grou
       addGroup(chipClusterPtr, callback, groupId, groupName);
     }
 
-
-    public void addGroupIfIdentifying(DefaultClusterCallback callback, int groupId, String groupName) {
+    public void addGroupIfIdentifying(
+        DefaultClusterCallback callback, int groupId, String groupName) {
       addGroupIfIdentifying(chipClusterPtr, callback, groupId, groupName);
     }
 
-
-    public void getGroupMembership(GetGroupMembershipResponseCallback callback, int groupCount, int groupList) {
+    public void getGroupMembership(
+        GetGroupMembershipResponseCallback callback, int groupCount, int groupList) {
       getGroupMembership(chipClusterPtr, callback, groupCount, groupList);
     }
 
-
     public void removeAllGroups(DefaultClusterCallback callback) {
       removeAllGroups(chipClusterPtr, callback);
     }
 
-
     public void removeGroup(RemoveGroupResponseCallback callback, int groupId) {
       removeGroup(chipClusterPtr, callback, groupId);
     }
 
-
     public void viewGroup(ViewGroupResponseCallback callback, int groupId) {
       viewGroup(chipClusterPtr, callback, groupId);
     }
 
-    private native void addGroup(long chipClusterPtr, AddGroupResponseCallback callback, int groupId, String groupName);
-    private native void addGroupIfIdentifying(long chipClusterPtr, DefaultClusterCallback callback, int groupId, String groupName);
-    private native void getGroupMembership(long chipClusterPtr, GetGroupMembershipResponseCallback callback, int groupCount, int groupList);
+    private native void addGroup(
+        long chipClusterPtr, AddGroupResponseCallback callback, int groupId, String groupName);
+
+    private native void addGroupIfIdentifying(
+        long chipClusterPtr, DefaultClusterCallback callback, int groupId, String groupName);
+
+    private native void getGroupMembership(
+        long chipClusterPtr,
+        GetGroupMembershipResponseCallback callback,
+        int groupCount,
+        int groupList);
+
     private native void removeAllGroups(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void removeGroup(long chipClusterPtr, RemoveGroupResponseCallback callback, int groupId);
-    private native void viewGroup(long chipClusterPtr, ViewGroupResponseCallback callback, int groupId);
+
+    private native void removeGroup(
+        long chipClusterPtr, RemoveGroupResponseCallback callback, int groupId);
+
+    private native void viewGroup(
+        long chipClusterPtr, ViewGroupResponseCallback callback, int groupId);
+
     public interface AddGroupResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      );
-      
+      void onSuccess(int status, int groupId);
+
       void onError(Exception error);
     }
 
     public interface GetGroupMembershipResponseCallback {
-      void onSuccess(
-      int capacity
-      , int groupCount
-      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      );
-      
+      void onSuccess(int capacity, int groupCount
+          // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          );
+
       void onError(Exception error);
     }
 
     public interface RemoveGroupResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      );
-      
+      void onSuccess(int status, int groupId);
+
       void onError(Exception error);
     }
 
     public interface ViewGroupResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      , String groupName
-      );
-      
+      void onSuccess(int status, int groupId, String groupName);
+
       void onError(Exception error);
     }
 
-
-
-    public void readNameSupportAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
       readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readNameSupportAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readNameSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class IdentifyCluster extends BaseChipCluster {
@@ -3501,32 +3489,33 @@ public void identify(DefaultClusterCallback callback, int identifyTime) {
       identify(chipClusterPtr, callback, identifyTime);
     }
 
-
     public void identifyQuery(IdentifyQueryResponseCallback callback) {
       identifyQuery(chipClusterPtr, callback);
     }
 
-
-    public void triggerEffect(DefaultClusterCallback callback, int effectIdentifier, int effectVariant) {
+    public void triggerEffect(
+        DefaultClusterCallback callback, int effectIdentifier, int effectVariant) {
       triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant);
     }
 
-    private native void identify(long chipClusterPtr, DefaultClusterCallback callback, int identifyTime);
+    private native void identify(
+        long chipClusterPtr, DefaultClusterCallback callback, int identifyTime);
+
     private native void identifyQuery(long chipClusterPtr, IdentifyQueryResponseCallback callback);
-    private native void triggerEffect(long chipClusterPtr, DefaultClusterCallback callback, int effectIdentifier, int effectVariant);
+
+    private native void triggerEffect(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int effectIdentifier,
+        int effectVariant);
+
     public interface IdentifyQueryResponseCallback {
-      void onSuccess(
-      int timeout
-      );
-      
+      void onSuccess(int timeout);
+
       void onError(Exception error);
     }
 
-
-
-    public void readIdentifyTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readIdentifyTimeAttribute(IntegerAttributeCallback callback) {
       readIdentifyTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3534,31 +3523,25 @@ public void writeIdentifyTimeAttribute(DefaultClusterCallback callback, int valu
       writeIdentifyTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readIdentifyTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readIdentifyTypeAttribute(IntegerAttributeCallback callback) {
       readIdentifyTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readIdentifyTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void writeIdentifyTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readIdentifyTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readIdentifyTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeIdentifyTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readIdentifyTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class IlluminanceMeasurementCluster extends BaseChipCluster {
@@ -3648,25 +3631,19 @@ public void sendKey(SendKeyResponseCallback callback, int keyCode) {
     }
 
     private native void sendKey(long chipClusterPtr, SendKeyResponseCallback callback, int keyCode);
+
     public interface SendKeyResponseCallback {
-      void onSuccess(
-      int status
-      );
-      
+      void onSuccess(int status);
+
       void onError(Exception error);
     }
 
-
-
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class LevelControlCluster extends BaseChipCluster {
@@ -3681,62 +3658,106 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void move(DefaultClusterCallback callback, int moveMode, int rate, int optionMask, int optionOverride) {
+    public void move(
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionMask,
+        int optionOverride) {
       move(chipClusterPtr, callback, moveMode, rate, optionMask, optionOverride);
     }
 
-
-    public void moveToLevel(DefaultClusterCallback callback, int level, int transitionTime, int optionMask, int optionOverride) {
+    public void moveToLevel(
+        DefaultClusterCallback callback,
+        int level,
+        int transitionTime,
+        int optionMask,
+        int optionOverride) {
       moveToLevel(chipClusterPtr, callback, level, transitionTime, optionMask, optionOverride);
     }
 
-
-    public void moveToLevelWithOnOff(DefaultClusterCallback callback, int level, int transitionTime) {
+    public void moveToLevelWithOnOff(
+        DefaultClusterCallback callback, int level, int transitionTime) {
       moveToLevelWithOnOff(chipClusterPtr, callback, level, transitionTime);
     }
 
-
     public void moveWithOnOff(DefaultClusterCallback callback, int moveMode, int rate) {
       moveWithOnOff(chipClusterPtr, callback, moveMode, rate);
     }
 
-
-    public void step(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionMask, int optionOverride) {
-      step(chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionMask, optionOverride);
+    public void step(
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionMask,
+        int optionOverride) {
+      step(
+          chipClusterPtr, callback, stepMode, stepSize, transitionTime, optionMask, optionOverride);
     }
 
-
-    public void stepWithOnOff(DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime) {
+    public void stepWithOnOff(
+        DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime) {
       stepWithOnOff(chipClusterPtr, callback, stepMode, stepSize, transitionTime);
     }
 
-
     public void stop(DefaultClusterCallback callback, int optionMask, int optionOverride) {
       stop(chipClusterPtr, callback, optionMask, optionOverride);
     }
 
-
     public void stopWithOnOff(DefaultClusterCallback callback) {
       stopWithOnOff(chipClusterPtr, callback);
     }
 
-    private native void move(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate, int optionMask, int optionOverride);
-    private native void moveToLevel(long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime, int optionMask, int optionOverride);
-    private native void moveToLevelWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime);
-    private native void moveWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate);
-    private native void step(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime, int optionMask, int optionOverride);
-    private native void stepWithOnOff(long chipClusterPtr, DefaultClusterCallback callback, int stepMode, int stepSize, int transitionTime);
-    private native void stop(long chipClusterPtr, DefaultClusterCallback callback, int optionMask, int optionOverride);
-    private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback callback);
+    private native void move(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int moveMode,
+        int rate,
+        int optionMask,
+        int optionOverride);
+
+    private native void moveToLevel(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int level,
+        int transitionTime,
+        int optionMask,
+        int optionOverride);
 
+    private native void moveToLevelWithOnOff(
+        long chipClusterPtr, DefaultClusterCallback callback, int level, int transitionTime);
 
-    public void readCurrentLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    private native void moveWithOnOff(
+        long chipClusterPtr, DefaultClusterCallback callback, int moveMode, int rate);
+
+    private native void step(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime,
+        int optionMask,
+        int optionOverride);
+
+    private native void stepWithOnOff(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int stepMode,
+        int stepSize,
+        int transitionTime);
+
+    private native void stop(
+        long chipClusterPtr, DefaultClusterCallback callback, int optionMask, int optionOverride);
+
+    private native void stopWithOnOff(long chipClusterPtr, DefaultClusterCallback callback);
+
+    public void readCurrentLevelAttribute(IntegerAttributeCallback callback) {
       readCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentLevelAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentLevelAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentLevelAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -3744,9 +3765,17 @@ public void reportCurrentLevelAttribute(IntegerAttributeCallback callback) {
       reportCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readRemainingTimeAttribute(
       IntegerAttributeCallback callback
     ) {
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+    public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
+>>>>>>> e993d01f0 (callback generation done)
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3853,15 +3882,111 @@ public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, i
     public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
+<<<<<<< HEAD
+=======
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+    public void readClusterRevisionAttribute(
+      IntegerAttributeCallback callback
+    ) {
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readCurrentLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readCurrentLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+>>>>>>> 6e6e45a1a (callback generation done)
+    private native void subscribeCurrentLevelAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportCurrentLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+    private native void readRemainingTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCurrentFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxFrequencyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readOptionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOptionsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readOnOffTransitionTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOnOffTransitionTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readOnLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOnLevelAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readOnTransitionTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOnTransitionTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readOffTransitionTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOffTransitionTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readDefaultMoveRateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeDefaultMoveRateAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readStartUpCurrentLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeStartUpCurrentLevelAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+=======
+=======
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+>>>>>>> e993d01f0 (callback generation done)
     private native void reportCurrentLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
   
     private native void readRemainingTimeAttribute(long chipClusterPtr,
@@ -3933,6 +4058,21 @@ private native void readStartUpCurrentLevelAttribute(long chipClusterPtr,
     private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
   }
 
   public static class LowPowerCluster extends BaseChipCluster {
@@ -3953,16 +4093,12 @@ public void sleep(DefaultClusterCallback callback) {
 
     private native void sleep(long chipClusterPtr, DefaultClusterCallback callback);
 
-
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class MediaInputCluster extends BaseChipCluster {
@@ -3981,28 +4117,31 @@ public void hideInputStatus(DefaultClusterCallback callback) {
       hideInputStatus(chipClusterPtr, callback);
     }
 
-
     public void renameInput(DefaultClusterCallback callback, int index, String name) {
       renameInput(chipClusterPtr, callback, index, name);
     }
 
-
     public void selectInput(DefaultClusterCallback callback, int index) {
       selectInput(chipClusterPtr, callback, index);
     }
 
-
     public void showInputStatus(DefaultClusterCallback callback) {
       showInputStatus(chipClusterPtr, callback);
     }
 
     private native void hideInputStatus(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void renameInput(long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
-    private native void selectInput(long chipClusterPtr, DefaultClusterCallback callback, int index);
+
+    private native void renameInput(
+        long chipClusterPtr, DefaultClusterCallback callback, int index, String name);
+
+    private native void selectInput(
+        long chipClusterPtr, DefaultClusterCallback callback, int index);
+
     private native void showInputStatus(long chipClusterPtr, DefaultClusterCallback callback);
 
     public static class MediaInputListAttribute {
       public int index;
+<<<<<<< HEAD
             public int inputType;
             public String name;
       public String description;
@@ -4013,6 +4152,13 @@ public MediaInputListAttribute(
                 String name,
         String description
       ) {
+=======
+      public int inputType;
+      public byte[] name;
+      public byte[] description;
+
+      public MediaInputListAttribute(int index, int inputType, byte[] name, byte[] description) {
+>>>>>>> e993d01f0 (callback generation done)
         this.index = index;
         this.inputType = inputType;
         this.name = name;
@@ -4021,41 +4167,31 @@ public MediaInputListAttribute(
     }
 
     public interface MediaInputListAttributeCallback {
-      void onSuccess(List<
-      MediaInputListAttribute
-      > valueList);
+      void onSuccess(List<MediaInputListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readMediaInputListAttribute(
-      MediaInputListAttributeCallback callback
-    ) {
+    public void readMediaInputListAttribute(MediaInputListAttributeCallback callback) {
       readMediaInputListAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentMediaInputAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentMediaInputAttribute(IntegerAttributeCallback callback) {
       readCurrentMediaInputAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readMediaInputListAttribute(long chipClusterPtr,
-      MediaInputListAttributeCallback callback
-    );
-  
-    private native void readCurrentMediaInputAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readMediaInputListAttribute(
+        long chipClusterPtr, MediaInputListAttributeCallback callback);
+
+    private native void readCurrentMediaInputAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class MediaPlaybackCluster extends BaseChipCluster {
@@ -4074,246 +4210,204 @@ public void mediaFastForward(MediaFastForwardResponseCallback callback) {
       mediaFastForward(chipClusterPtr, callback);
     }
 
-
     public void mediaNext(MediaNextResponseCallback callback) {
       mediaNext(chipClusterPtr, callback);
     }
 
-
     public void mediaPause(MediaPauseResponseCallback callback) {
       mediaPause(chipClusterPtr, callback);
     }
 
-
     public void mediaPlay(MediaPlayResponseCallback callback) {
       mediaPlay(chipClusterPtr, callback);
     }
 
-
     public void mediaPrevious(MediaPreviousResponseCallback callback) {
       mediaPrevious(chipClusterPtr, callback);
     }
 
-
     public void mediaRewind(MediaRewindResponseCallback callback) {
       mediaRewind(chipClusterPtr, callback);
     }
 
-
     public void mediaSeek(MediaSeekResponseCallback callback, long position) {
       mediaSeek(chipClusterPtr, callback, position);
     }
 
-
-    public void mediaSkipBackward(MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds) {
+    public void mediaSkipBackward(
+        MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds) {
       mediaSkipBackward(chipClusterPtr, callback, deltaPositionMilliseconds);
     }
 
-
-    public void mediaSkipForward(MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds) {
+    public void mediaSkipForward(
+        MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds) {
       mediaSkipForward(chipClusterPtr, callback, deltaPositionMilliseconds);
     }
 
-
     public void mediaStartOver(MediaStartOverResponseCallback callback) {
       mediaStartOver(chipClusterPtr, callback);
     }
 
-
     public void mediaStop(MediaStopResponseCallback callback) {
       mediaStop(chipClusterPtr, callback);
     }
 
-    private native void mediaFastForward(long chipClusterPtr, MediaFastForwardResponseCallback callback);
+    private native void mediaFastForward(
+        long chipClusterPtr, MediaFastForwardResponseCallback callback);
+
     private native void mediaNext(long chipClusterPtr, MediaNextResponseCallback callback);
+
     private native void mediaPause(long chipClusterPtr, MediaPauseResponseCallback callback);
+
     private native void mediaPlay(long chipClusterPtr, MediaPlayResponseCallback callback);
+
     private native void mediaPrevious(long chipClusterPtr, MediaPreviousResponseCallback callback);
+
     private native void mediaRewind(long chipClusterPtr, MediaRewindResponseCallback callback);
-    private native void mediaSeek(long chipClusterPtr, MediaSeekResponseCallback callback, long position);
-    private native void mediaSkipBackward(long chipClusterPtr, MediaSkipBackwardResponseCallback callback, long deltaPositionMilliseconds);
-    private native void mediaSkipForward(long chipClusterPtr, MediaSkipForwardResponseCallback callback, long deltaPositionMilliseconds);
-    private native void mediaStartOver(long chipClusterPtr, MediaStartOverResponseCallback callback);
-    private native void mediaStop(long chipClusterPtr, MediaStopResponseCallback callback);
-    public interface MediaFastForwardResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+
+    private native void mediaSeek(
+        long chipClusterPtr, MediaSeekResponseCallback callback, long position);
+
+    private native void mediaSkipBackward(
+        long chipClusterPtr,
+        MediaSkipBackwardResponseCallback callback,
+        long deltaPositionMilliseconds);
+
+    private native void mediaSkipForward(
+        long chipClusterPtr,
+        MediaSkipForwardResponseCallback callback,
+        long deltaPositionMilliseconds);
+
+    private native void mediaStartOver(
+        long chipClusterPtr, MediaStartOverResponseCallback callback);
+
+    private native void mediaStop(long chipClusterPtr, MediaStopResponseCallback callback);
+
+    public interface MediaFastForwardResponseCallback {
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaNextResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaPauseResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaPlayResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaPreviousResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaRewindResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaSeekResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaSkipBackwardResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaSkipForwardResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaStartOverResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
     public interface MediaStopResponseCallback {
-      void onSuccess(
-      int mediaPlaybackStatus
-      );
-      
+      void onSuccess(int mediaPlaybackStatus);
+
       void onError(Exception error);
     }
 
-
-
-    public void readPlaybackStateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPlaybackStateAttribute(IntegerAttributeCallback callback) {
       readPlaybackStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readStartTimeAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readStartTimeAttribute(LongAttributeCallback callback) {
       readStartTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readDurationAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readDurationAttribute(LongAttributeCallback callback) {
       readDurationAttribute(chipClusterPtr, callback);
     }
 
-    public void readPositionUpdatedAtAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPositionUpdatedAtAttribute(LongAttributeCallback callback) {
       readPositionUpdatedAtAttribute(chipClusterPtr, callback);
     }
 
-    public void readPositionAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPositionAttribute(LongAttributeCallback callback) {
       readPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readPlaybackSpeedAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPlaybackSpeedAttribute(LongAttributeCallback callback) {
       readPlaybackSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readSeekRangeEndAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readSeekRangeEndAttribute(LongAttributeCallback callback) {
       readSeekRangeEndAttribute(chipClusterPtr, callback);
     }
 
-    public void readSeekRangeStartAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readSeekRangeStartAttribute(LongAttributeCallback callback) {
       readSeekRangeStartAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readPlaybackStateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readStartTimeAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readDurationAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPositionUpdatedAtAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPositionAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPlaybackSpeedAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readSeekRangeEndAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readSeekRangeStartAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readPlaybackStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readStartTimeAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readDurationAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPositionUpdatedAtAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPositionAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPlaybackSpeedAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readSeekRangeEndAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readSeekRangeStartAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class NetworkCommissioningCluster extends BaseChipCluster {
@@ -4328,156 +4422,194 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addThreadNetwork(AddThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs) {
+    public void addThreadNetwork(
+        AddThreadNetworkResponseCallback callback,
+        byte[] operationalDataset,
+        long breadcrumb,
+        long timeoutMs) {
       addThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timeoutMs);
     }
 
-
-    public void addWiFiNetwork(AddWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs) {
+    public void addWiFiNetwork(
+        AddWiFiNetworkResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        long breadcrumb,
+        long timeoutMs) {
       addWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timeoutMs);
     }
 
-
-    public void disableNetwork(DisableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
+    public void disableNetwork(
+        DisableNetworkResponseCallback callback,
+        byte[] networkID,
+        long breadcrumb,
+        long timeoutMs) {
       disableNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
-
-    public void enableNetwork(EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
+    public void enableNetwork(
+        EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
       enableNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
-
     public void getLastNetworkCommissioningResult(DefaultClusterCallback callback, long timeoutMs) {
       getLastNetworkCommissioningResult(chipClusterPtr, callback, timeoutMs);
     }
 
-
-    public void removeNetwork(RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
+    public void removeNetwork(
+        RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs) {
       removeNetwork(chipClusterPtr, callback, networkID, breadcrumb, timeoutMs);
     }
 
-
-    public void scanNetworks(ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs) {
+    public void scanNetworks(
+        ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs) {
       scanNetworks(chipClusterPtr, callback, ssid, breadcrumb, timeoutMs);
     }
 
-
-    public void updateThreadNetwork(UpdateThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs) {
+    public void updateThreadNetwork(
+        UpdateThreadNetworkResponseCallback callback,
+        byte[] operationalDataset,
+        long breadcrumb,
+        long timeoutMs) {
       updateThreadNetwork(chipClusterPtr, callback, operationalDataset, breadcrumb, timeoutMs);
     }
 
-
-    public void updateWiFiNetwork(UpdateWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs) {
+    public void updateWiFiNetwork(
+        UpdateWiFiNetworkResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        long breadcrumb,
+        long timeoutMs) {
       updateWiFiNetwork(chipClusterPtr, callback, ssid, credentials, breadcrumb, timeoutMs);
     }
 
-    private native void addThreadNetwork(long chipClusterPtr, AddThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs);
-    private native void addWiFiNetwork(long chipClusterPtr, AddWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs);
-    private native void disableNetwork(long chipClusterPtr, DisableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
-    private native void enableNetwork(long chipClusterPtr, EnableNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
-    private native void getLastNetworkCommissioningResult(long chipClusterPtr, DefaultClusterCallback callback, long timeoutMs);
-    private native void removeNetwork(long chipClusterPtr, RemoveNetworkResponseCallback callback, byte[] networkID, long breadcrumb, long timeoutMs);
-    private native void scanNetworks(long chipClusterPtr, ScanNetworksResponseCallback callback, byte[] ssid, long breadcrumb, long timeoutMs);
-    private native void updateThreadNetwork(long chipClusterPtr, UpdateThreadNetworkResponseCallback callback, byte[] operationalDataset, long breadcrumb, long timeoutMs);
-    private native void updateWiFiNetwork(long chipClusterPtr, UpdateWiFiNetworkResponseCallback callback, byte[] ssid, byte[] credentials, long breadcrumb, long timeoutMs);
+    private native void addThreadNetwork(
+        long chipClusterPtr,
+        AddThreadNetworkResponseCallback callback,
+        byte[] operationalDataset,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void addWiFiNetwork(
+        long chipClusterPtr,
+        AddWiFiNetworkResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void disableNetwork(
+        long chipClusterPtr,
+        DisableNetworkResponseCallback callback,
+        byte[] networkID,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void enableNetwork(
+        long chipClusterPtr,
+        EnableNetworkResponseCallback callback,
+        byte[] networkID,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void getLastNetworkCommissioningResult(
+        long chipClusterPtr, DefaultClusterCallback callback, long timeoutMs);
+
+    private native void removeNetwork(
+        long chipClusterPtr,
+        RemoveNetworkResponseCallback callback,
+        byte[] networkID,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void scanNetworks(
+        long chipClusterPtr,
+        ScanNetworksResponseCallback callback,
+        byte[] ssid,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void updateThreadNetwork(
+        long chipClusterPtr,
+        UpdateThreadNetworkResponseCallback callback,
+        byte[] operationalDataset,
+        long breadcrumb,
+        long timeoutMs);
+
+    private native void updateWiFiNetwork(
+        long chipClusterPtr,
+        UpdateWiFiNetworkResponseCallback callback,
+        byte[] ssid,
+        byte[] credentials,
+        long breadcrumb,
+        long timeoutMs);
+
     public interface AddThreadNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface AddWiFiNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface DisableNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface EnableNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface RemoveNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface ScanNetworksResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      );
-      
+      void onSuccess(int errorCode, String debugText
+          // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          );
+
       void onError(Exception error);
     }
 
     public interface UpdateThreadNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
     public interface UpdateWiFiNetworkResponseCallback {
-      void onSuccess(
-      int errorCode
-      , String debugText
-      );
-      
+      void onSuccess(int errorCode, String debugText);
+
       void onError(Exception error);
     }
 
-
-
-    public void readFeatureMapAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readFeatureMapAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OtaSoftwareUpdateProviderCluster extends BaseChipCluster {
@@ -4492,58 +4624,89 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void applyUpdateRequest(ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion) {
+    public void applyUpdateRequest(
+        ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion) {
       applyUpdateRequest(chipClusterPtr, callback, updateToken, newVersion);
     }
 
-
-    public void notifyUpdateApplied(DefaultClusterCallback callback, byte[] updateToken, long softwareVersion) {
+    public void notifyUpdateApplied(
+        DefaultClusterCallback callback, byte[] updateToken, long softwareVersion) {
       notifyUpdateApplied(chipClusterPtr, callback, updateToken, softwareVersion);
     }
 
-
-    public void queryImage(QueryImageResponseCallback callback, int vendorId, int productId, int hardwareVersion, long softwareVersion, int protocolsSupported, String location, boolean requestorCanConsent, byte[] metadataForProvider) {
-      queryImage(chipClusterPtr, callback, vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, location, requestorCanConsent, metadataForProvider);
+    public void queryImage(
+        QueryImageResponseCallback callback,
+        int vendorId,
+        int productId,
+        int hardwareVersion,
+        long softwareVersion,
+        int protocolsSupported,
+        String location,
+        boolean requestorCanConsent,
+        byte[] metadataForProvider) {
+      queryImage(
+          chipClusterPtr,
+          callback,
+          vendorId,
+          productId,
+          hardwareVersion,
+          softwareVersion,
+          protocolsSupported,
+          location,
+          requestorCanConsent,
+          metadataForProvider);
     }
 
-    private native void applyUpdateRequest(long chipClusterPtr, ApplyUpdateRequestResponseCallback callback, byte[] updateToken, long newVersion);
-    private native void notifyUpdateApplied(long chipClusterPtr, DefaultClusterCallback callback, byte[] updateToken, long softwareVersion);
-    private native void queryImage(long chipClusterPtr, QueryImageResponseCallback callback, int vendorId, int productId, int hardwareVersion, long softwareVersion, int protocolsSupported, String location, boolean requestorCanConsent, byte[] metadataForProvider);
+    private native void applyUpdateRequest(
+        long chipClusterPtr,
+        ApplyUpdateRequestResponseCallback callback,
+        byte[] updateToken,
+        long newVersion);
+
+    private native void notifyUpdateApplied(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        byte[] updateToken,
+        long softwareVersion);
+
+    private native void queryImage(
+        long chipClusterPtr,
+        QueryImageResponseCallback callback,
+        int vendorId,
+        int productId,
+        int hardwareVersion,
+        long softwareVersion,
+        int protocolsSupported,
+        String location,
+        boolean requestorCanConsent,
+        byte[] metadataForProvider);
+
     public interface ApplyUpdateRequestResponseCallback {
-      void onSuccess(
-      int action
-      , long delayedActionTime
-      );
-      
+      void onSuccess(int action, long delayedActionTime);
+
       void onError(Exception error);
     }
 
     public interface QueryImageResponseCallback {
       void onSuccess(
-      int status
-      , long delayedActionTime
-      , String imageURI
-      , long softwareVersion
-      , String softwareVersionString
-      , byte[] updateToken
-      , boolean userConsentNeeded
-      , byte[] metadataForRequestor
-      );
-      
+          int status,
+          long delayedActionTime,
+          String imageURI,
+          long softwareVersion,
+          String softwareVersionString,
+          byte[] updateToken,
+          boolean userConsentNeeded,
+          byte[] metadataForRequestor);
+
       void onError(Exception error);
     }
 
-
-
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OtaSoftwareUpdateRequestorCluster extends BaseChipCluster {
@@ -4558,10 +4721,16 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void announceOtaProvider(
         DefaultClusterCallback callback,
         long providerLocation,
+=======
+    public void announceOtaProvider(
+        DefaultClusterCallback callback,
+        byte[] providerLocation,
+>>>>>>> 677ef48a5 (callback generation done)
         int vendorId,
         int announcementReason,
         byte[] metadataForNode) {
@@ -4572,6 +4741,7 @@ public void announceOtaProvider(
           vendorId,
           announcementReason,
           metadataForNode);
+<<<<<<< HEAD
     }
 
     private native void announceOtaProvider(
@@ -4588,11 +4758,19 @@ public void announceOtaProvider(DefaultClusterCallback callback, byte[] provider
 
     private native void announceOtaProvider(long chipClusterPtr, DefaultClusterCallback callback, byte[] providerLocation, int vendorId, int announcementReason, byte[] metadataForNode);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    }
 
+    private native void announceOtaProvider(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        byte[] providerLocation,
+        int vendorId,
+        int announcementReason,
+        byte[] metadataForNode);
+>>>>>>> 677ef48a5 (callback generation done)
 
-    public void readDefaultOtaProviderAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readDefaultOtaProviderAttribute(OctetStringAttributeCallback callback) {
       readDefaultOtaProviderAttribute(chipClusterPtr, callback);
     }
 
@@ -4600,31 +4778,25 @@ public void writeDefaultOtaProviderAttribute(DefaultClusterCallback callback, by
       writeDefaultOtaProviderAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readUpdatePossibleAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readUpdatePossibleAttribute(BooleanAttributeCallback callback) {
       readUpdatePossibleAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readDefaultOtaProviderAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
 
-    private native void writeDefaultOtaProviderAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
-  
-    private native void readUpdatePossibleAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readDefaultOtaProviderAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void writeDefaultOtaProviderAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
+
+    private native void readUpdatePossibleAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OccupancySensingCluster extends BaseChipCluster {
@@ -4639,14 +4811,12 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readOccupancyAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOccupancyAttribute(IntegerAttributeCallback callback) {
       readOccupancyAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOccupancyAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOccupancyAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOccupancyAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -4654,43 +4824,35 @@ public void reportOccupancyAttribute(IntegerAttributeCallback callback) {
       reportOccupancyAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupancySensorTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOccupancySensorTypeAttribute(IntegerAttributeCallback callback) {
       readOccupancySensorTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupancySensorTypeBitmapAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOccupancySensorTypeBitmapAttribute(IntegerAttributeCallback callback) {
       readOccupancySensorTypeBitmapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readOccupancyAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeOccupancyAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readOccupancyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportOccupancyAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readOccupancySensorTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readOccupancySensorTypeBitmapAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeOccupancyAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportOccupancyAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readOccupancySensorTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readOccupancySensorTypeBitmapAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OnOffCluster extends BaseChipCluster {
@@ -4709,46 +4871,52 @@ public void off(DefaultClusterCallback callback) {
       off(chipClusterPtr, callback);
     }
 
-
     public void offWithEffect(DefaultClusterCallback callback, int effectId, int effectVariant) {
       offWithEffect(chipClusterPtr, callback, effectId, effectVariant);
     }
 
-
     public void on(DefaultClusterCallback callback) {
       on(chipClusterPtr, callback);
     }
 
-
     public void onWithRecallGlobalScene(DefaultClusterCallback callback) {
       onWithRecallGlobalScene(chipClusterPtr, callback);
     }
 
-
-    public void onWithTimedOff(DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime) {
+    public void onWithTimedOff(
+        DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime) {
       onWithTimedOff(chipClusterPtr, callback, onOffControl, onTime, offWaitTime);
     }
 
-
     public void toggle(DefaultClusterCallback callback) {
       toggle(chipClusterPtr, callback);
     }
 
     private native void off(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void offWithEffect(long chipClusterPtr, DefaultClusterCallback callback, int effectId, int effectVariant);
+
+    private native void offWithEffect(
+        long chipClusterPtr, DefaultClusterCallback callback, int effectId, int effectVariant);
+
     private native void on(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void onWithRecallGlobalScene(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void onWithTimedOff(long chipClusterPtr, DefaultClusterCallback callback, int onOffControl, int onTime, int offWaitTime);
-    private native void toggle(long chipClusterPtr, DefaultClusterCallback callback);
 
+    private native void onWithRecallGlobalScene(
+        long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readOnOffAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    private native void onWithTimedOff(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int onOffControl,
+        int onTime,
+        int offWaitTime);
+
+    private native void toggle(long chipClusterPtr, DefaultClusterCallback callback);
+
+    public void readOnOffAttribute(BooleanAttributeCallback callback) {
       readOnOffAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOnOffAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOnOffAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOnOffAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -4756,15 +4924,11 @@ public void reportOnOffAttribute(BooleanAttributeCallback callback) {
       reportOnOffAttribute(chipClusterPtr, callback);
     }
 
-    public void readGlobalSceneControlAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readGlobalSceneControlAttribute(BooleanAttributeCallback callback) {
       readGlobalSceneControlAttribute(chipClusterPtr, callback);
     }
 
-    public void readOnTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOnTimeAttribute(IntegerAttributeCallback callback) {
       readOnTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -4772,9 +4936,7 @@ public void writeOnTimeAttribute(DefaultClusterCallback callback, int value) {
       writeOnTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOffWaitTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOffWaitTimeAttribute(IntegerAttributeCallback callback) {
       readOffWaitTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -4782,9 +4944,7 @@ public void writeOffWaitTimeAttribute(DefaultClusterCallback callback, int value
       writeOffWaitTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartUpOnOffAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStartUpOnOffAttribute(IntegerAttributeCallback callback) {
       readStartUpOnOffAttribute(chipClusterPtr, callback);
     }
 
@@ -4792,55 +4952,47 @@ public void writeStartUpOnOffAttribute(DefaultClusterCallback callback, int valu
       writeStartUpOnOffAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readFeatureMapAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readOnOffAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
 
-    private native void subscribeOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void reportOnOffAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-  
-    private native void readGlobalSceneControlAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readOnTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeOnOffAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void writeOnTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOffWaitTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportOnOffAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writeOffWaitTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readStartUpOnOffAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readGlobalSceneControlAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writeStartUpOnOffAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readFeatureMapAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readOnTimeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOnTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readOffWaitTimeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOffWaitTimeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readStartUpOnOffAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeStartUpOnOffAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OnOffSwitchConfigurationCluster extends BaseChipCluster {
@@ -4855,16 +5007,11 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readSwitchTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSwitchTypeAttribute(IntegerAttributeCallback callback) {
       readSwitchTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readSwitchActionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSwitchActionsAttribute(IntegerAttributeCallback callback) {
       readSwitchActionsAttribute(chipClusterPtr, callback);
     }
 
@@ -4872,25 +5019,21 @@ public void writeSwitchActionsAttribute(DefaultClusterCallback callback, int val
       writeSwitchActionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readSwitchTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readSwitchActionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void writeSwitchActionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readSwitchTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readSwitchActionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeSwitchActionsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class OperationalCredentialsCluster extends BaseChipCluster {
@@ -4905,100 +5048,121 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addNOC(NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue, byte[] IPKValue, long caseAdminNode, int adminVendorId) {
+    public void addNOC(
+        NOCResponseCallback callback,
+        byte[] NOCValue,
+        byte[] ICACValue,
+        byte[] IPKValue,
+        long caseAdminNode,
+        int adminVendorId) {
       addNOC(chipClusterPtr, callback, NOCValue, ICACValue, IPKValue, caseAdminNode, adminVendorId);
     }
 
-
     public void addTrustedRootCertificate(DefaultClusterCallback callback, byte[] rootCertificate) {
       addTrustedRootCertificate(chipClusterPtr, callback, rootCertificate);
     }
 
-
     public void attestationRequest(AttestationResponseCallback callback, byte[] attestationNonce) {
       attestationRequest(chipClusterPtr, callback, attestationNonce);
     }
 
-
-    public void certificateChainRequest(CertificateChainResponseCallback callback, int certificateType) {
+    public void certificateChainRequest(
+        CertificateChainResponseCallback callback, int certificateType) {
       certificateChainRequest(chipClusterPtr, callback, certificateType);
     }
 
-
     public void opCSRRequest(OpCSRResponseCallback callback, byte[] CSRNonce) {
       opCSRRequest(chipClusterPtr, callback, CSRNonce);
     }
 
-
     public void removeFabric(NOCResponseCallback callback, int fabricIndex) {
       removeFabric(chipClusterPtr, callback, fabricIndex);
     }
 
-
-    public void removeTrustedRootCertificate(DefaultClusterCallback callback, byte[] trustedRootIdentifier) {
+    public void removeTrustedRootCertificate(
+        DefaultClusterCallback callback, byte[] trustedRootIdentifier) {
       removeTrustedRootCertificate(chipClusterPtr, callback, trustedRootIdentifier);
     }
 
-
     public void updateFabricLabel(NOCResponseCallback callback, String label) {
       updateFabricLabel(chipClusterPtr, callback, label);
     }
 
-
     public void updateNOC(NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue) {
       updateNOC(chipClusterPtr, callback, NOCValue, ICACValue);
     }
 
-    private native void addNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue, byte[] IPKValue, long caseAdminNode, int adminVendorId);
-    private native void addTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback callback, byte[] rootCertificate);
-    private native void attestationRequest(long chipClusterPtr, AttestationResponseCallback callback, byte[] attestationNonce);
-    private native void certificateChainRequest(long chipClusterPtr, CertificateChainResponseCallback callback, int certificateType);
-    private native void opCSRRequest(long chipClusterPtr, OpCSRResponseCallback callback, byte[] CSRNonce);
-    private native void removeFabric(long chipClusterPtr, NOCResponseCallback callback, int fabricIndex);
-    private native void removeTrustedRootCertificate(long chipClusterPtr, DefaultClusterCallback callback, byte[] trustedRootIdentifier);
-    private native void updateFabricLabel(long chipClusterPtr, NOCResponseCallback callback, String label);
-    private native void updateNOC(long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue);
+    private native void addNOC(
+        long chipClusterPtr,
+        NOCResponseCallback callback,
+        byte[] NOCValue,
+        byte[] ICACValue,
+        byte[] IPKValue,
+        long caseAdminNode,
+        int adminVendorId);
+
+    private native void addTrustedRootCertificate(
+        long chipClusterPtr, DefaultClusterCallback callback, byte[] rootCertificate);
+
+    private native void attestationRequest(
+        long chipClusterPtr, AttestationResponseCallback callback, byte[] attestationNonce);
+
+    private native void certificateChainRequest(
+        long chipClusterPtr, CertificateChainResponseCallback callback, int certificateType);
+
+    private native void opCSRRequest(
+        long chipClusterPtr, OpCSRResponseCallback callback, byte[] CSRNonce);
+
+    private native void removeFabric(
+        long chipClusterPtr, NOCResponseCallback callback, int fabricIndex);
+
+    private native void removeTrustedRootCertificate(
+        long chipClusterPtr, DefaultClusterCallback callback, byte[] trustedRootIdentifier);
+
+    private native void updateFabricLabel(
+        long chipClusterPtr, NOCResponseCallback callback, String label);
+
+    private native void updateNOC(
+        long chipClusterPtr, NOCResponseCallback callback, byte[] NOCValue, byte[] ICACValue);
+
     public interface AttestationResponseCallback {
-      void onSuccess(
-      byte[] AttestationElements
-      , byte[] Signature
-      );
-      
+      void onSuccess(byte[] AttestationElements, byte[] Signature);
+
       void onError(Exception error);
     }
 
     public interface CertificateChainResponseCallback {
-      void onSuccess(
-      byte[] Certificate
-      );
-      
+      void onSuccess(byte[] Certificate);
+
       void onError(Exception error);
     }
 
     public interface NOCResponseCallback {
+<<<<<<< HEAD
       void onSuccess(
       int StatusCode
       , int FabricIndex
       , String DebugText
       );
       
+=======
+      void onSuccess(int StatusCode, int FabricIndex, byte[] DebugText);
+
+>>>>>>> e993d01f0 (callback generation done)
       void onError(Exception error);
     }
 
     public interface OpCSRResponseCallback {
-      void onSuccess(
-      byte[] NOCSRElements
-      , byte[] AttestationSignature
-      );
-      
+      void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature);
+
       void onError(Exception error);
     }
 
-
     public static class FabricsListAttribute {
       public int fabricIndex;
-            public byte[] rootPublicKey;
+      public byte[] rootPublicKey;
       public int vendorId;
+<<<<<<< HEAD
             public long fabricId;
             public long nodeId;
             public String label;
@@ -5011,6 +5175,19 @@ public FabricsListAttribute(
                 long nodeId,
                 String label
       ) {
+=======
+      public long fabricId;
+      public long nodeId;
+      public byte[] label;
+
+      public FabricsListAttribute(
+          int fabricIndex,
+          byte[] rootPublicKey,
+          int vendorId,
+          long fabricId,
+          long nodeId,
+          byte[] label) {
+>>>>>>> e993d01f0 (callback generation done)
         this.fabricIndex = fabricIndex;
         this.rootPublicKey = rootPublicKey;
         this.vendorId = vendorId;
@@ -5021,12 +5198,12 @@ public FabricsListAttribute(
     }
 
     public interface FabricsListAttributeCallback {
-      void onSuccess(List<
-      FabricsListAttribute
-      > valueList);
+      void onSuccess(List<FabricsListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public interface TrustedRootCertificatesAttributeCallback {
       void onSuccess(List<byte[]> valueList);
@@ -5040,21 +5217,21 @@ public void readFabricsListAttribute(
       FabricsListAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readFabricsListAttribute(FabricsListAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readFabricsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readSupportedFabricsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSupportedFabricsAttribute(IntegerAttributeCallback callback) {
       readSupportedFabricsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCommissionedFabricsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCommissionedFabricsAttribute(IntegerAttributeCallback callback) {
       readCommissionedFabricsAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readTrustedRootCertificatesAttribute(
         TrustedRootCertificatesAttributeCallback callback) {
@@ -5109,6 +5286,23 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+
+    private native void readFabricsListAttribute(
+        long chipClusterPtr, FabricsListAttributeCallback callback);
+
+    private native void readSupportedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCommissionedFabricsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class PowerSourceCluster extends BaseChipCluster {
@@ -5123,123 +5317,86 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
     public interface ActiveBatteryFaultsAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
+      void onSuccess(List<Integer> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStatusAttribute(IntegerAttributeCallback callback) {
       readStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readOrderAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOrderAttribute(IntegerAttributeCallback callback) {
       readOrderAttribute(chipClusterPtr, callback);
     }
 
-    public void readDescriptionAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readDescriptionAttribute(CharStringAttributeCallback callback) {
       readDescriptionAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryVoltageAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBatteryVoltageAttribute(LongAttributeCallback callback) {
       readBatteryVoltageAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryPercentRemainingAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBatteryPercentRemainingAttribute(IntegerAttributeCallback callback) {
       readBatteryPercentRemainingAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryTimeRemainingAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBatteryTimeRemainingAttribute(LongAttributeCallback callback) {
       readBatteryTimeRemainingAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryChargeLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBatteryChargeLevelAttribute(IntegerAttributeCallback callback) {
       readBatteryChargeLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readActiveBatteryFaultsAttribute(
-      ActiveBatteryFaultsAttributeCallback callback
-    ) {
+    public void readActiveBatteryFaultsAttribute(ActiveBatteryFaultsAttributeCallback callback) {
       readActiveBatteryFaultsAttribute(chipClusterPtr, callback);
     }
 
-    public void readBatteryChargeStateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBatteryChargeStateAttribute(IntegerAttributeCallback callback) {
       readBatteryChargeStateAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readOrderAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readDescriptionAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readBatteryVoltageAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readBatteryPercentRemainingAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBatteryTimeRemainingAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readBatteryChargeLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readActiveBatteryFaultsAttribute(long chipClusterPtr,
-      ActiveBatteryFaultsAttributeCallback callback
-    );
-  
-    private native void readBatteryChargeStateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readFeatureMapAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readOrderAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readDescriptionAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readBatteryVoltageAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readBatteryPercentRemainingAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBatteryTimeRemainingAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readBatteryChargeLevelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readActiveBatteryFaultsAttribute(
+        long chipClusterPtr, ActiveBatteryFaultsAttributeCallback callback);
+
+    private native void readBatteryChargeStateAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class PressureMeasurementCluster extends BaseChipCluster {
@@ -5254,14 +5411,12 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5269,43 +5424,35 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeMeasuredValueAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class PumpConfigurationAndControlCluster extends BaseChipCluster {
@@ -5320,25 +5467,19 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMaxPressureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxPressureAttribute(IntegerAttributeCallback callback) {
       readMaxPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxSpeedAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxSpeedAttribute(IntegerAttributeCallback callback) {
       readMaxSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxFlowAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxFlowAttribute(IntegerAttributeCallback callback) {
       readMaxFlowAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readMinConstPressureAttribute(
       IntegerAttributeCallback callback
     ) {
@@ -5416,22 +5557,22 @@ public void reportPumpStatusAttribute(IntegerAttributeCallback callback) {
     public void readEffectiveOperationModeAttribute(
       IntegerAttributeCallback callback
     ) {
+=======
+    public void readEffectiveOperationModeAttribute(IntegerAttributeCallback callback) {
+>>>>>>> e993d01f0 (callback generation done)
       readEffectiveOperationModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readEffectiveControlModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEffectiveControlModeAttribute(IntegerAttributeCallback callback) {
       readEffectiveControlModeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCapacityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCapacityAttribute(IntegerAttributeCallback callback) {
       readCapacityAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCapacityAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCapacityAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCapacityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5439,6 +5580,7 @@ public void reportCapacityAttribute(IntegerAttributeCallback callback) {
       reportCapacityAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
     public void readSpeedAttribute(
       IntegerAttributeCallback callback
     ) {
@@ -5454,6 +5596,9 @@ public void readLifetimeEnergyConsumedAttribute(
     public void readOperationModeAttribute(
       IntegerAttributeCallback callback
     ) {
+=======
+    public void readOperationModeAttribute(IntegerAttributeCallback callback) {
+>>>>>>> e993d01f0 (callback generation done)
       readOperationModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5461,6 +5606,7 @@ public void writeOperationModeAttribute(DefaultClusterCallback callback, int val
       writeOperationModeAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
     public void readControlModeAttribute(
       IntegerAttributeCallback callback
     ) {
@@ -5560,9 +5706,16 @@ private native void readEffectiveControlModeAttribute(long chipClusterPtr,
     private native void readCapacityAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
+>>>>>>> e993d01f0 (callback generation done)
 
-    private native void subscribeCapacityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readMaxPressureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
     private native void reportCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
   
     private native void readSpeedAttribute(long chipClusterPtr,
@@ -5596,6 +5749,37 @@ private native void readFeatureMapAttribute(long chipClusterPtr,
     private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
+=======
+    private native void readMaxSpeedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxFlowAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readEffectiveOperationModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readEffectiveControlModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCapacityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeCapacityAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportCapacityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readOperationModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeOperationModeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> e993d01f0 (callback generation done)
   }
 
   public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
@@ -5610,14 +5794,12 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5625,18 +5807,15 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
@@ -5657,16 +5836,19 @@ public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -5679,6 +5861,7 @@ private native void readMinMeasuredValueAttribute(
     private native void readMaxMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
     private native void readToleranceAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -5705,6 +5888,10 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ScenesCluster extends BaseChipCluster {
@@ -5719,180 +5906,174 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-    public void addScene(AddSceneResponseCallback callback, int groupId, int sceneId, int transitionTime, String sceneName, long clusterId, int length, int value) {
-      addScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, sceneName, clusterId, length, value);
+    public void addScene(
+        AddSceneResponseCallback callback,
+        int groupId,
+        int sceneId,
+        int transitionTime,
+        String sceneName,
+        long clusterId,
+        int length,
+        int value) {
+      addScene(
+          chipClusterPtr,
+          callback,
+          groupId,
+          sceneId,
+          transitionTime,
+          sceneName,
+          clusterId,
+          length,
+          value);
     }
 
-
     public void getSceneMembership(GetSceneMembershipResponseCallback callback, int groupId) {
       getSceneMembership(chipClusterPtr, callback, groupId);
     }
 
-
-    public void recallScene(DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime) {
+    public void recallScene(
+        DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime) {
       recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime);
     }
 
-
     public void removeAllScenes(RemoveAllScenesResponseCallback callback, int groupId) {
       removeAllScenes(chipClusterPtr, callback, groupId);
     }
 
-
     public void removeScene(RemoveSceneResponseCallback callback, int groupId, int sceneId) {
       removeScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
-
     public void storeScene(StoreSceneResponseCallback callback, int groupId, int sceneId) {
       storeScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
-
     public void viewScene(ViewSceneResponseCallback callback, int groupId, int sceneId) {
       viewScene(chipClusterPtr, callback, groupId, sceneId);
     }
 
-    private native void addScene(long chipClusterPtr, AddSceneResponseCallback callback, int groupId, int sceneId, int transitionTime, String sceneName, long clusterId, int length, int value);
-    private native void getSceneMembership(long chipClusterPtr, GetSceneMembershipResponseCallback callback, int groupId);
-    private native void recallScene(long chipClusterPtr, DefaultClusterCallback callback, int groupId, int sceneId, int transitionTime);
-    private native void removeAllScenes(long chipClusterPtr, RemoveAllScenesResponseCallback callback, int groupId);
-    private native void removeScene(long chipClusterPtr, RemoveSceneResponseCallback callback, int groupId, int sceneId);
-    private native void storeScene(long chipClusterPtr, StoreSceneResponseCallback callback, int groupId, int sceneId);
-    private native void viewScene(long chipClusterPtr, ViewSceneResponseCallback callback, int groupId, int sceneId);
+    private native void addScene(
+        long chipClusterPtr,
+        AddSceneResponseCallback callback,
+        int groupId,
+        int sceneId,
+        int transitionTime,
+        String sceneName,
+        long clusterId,
+        int length,
+        int value);
+
+    private native void getSceneMembership(
+        long chipClusterPtr, GetSceneMembershipResponseCallback callback, int groupId);
+
+    private native void recallScene(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int groupId,
+        int sceneId,
+        int transitionTime);
+
+    private native void removeAllScenes(
+        long chipClusterPtr, RemoveAllScenesResponseCallback callback, int groupId);
+
+    private native void removeScene(
+        long chipClusterPtr, RemoveSceneResponseCallback callback, int groupId, int sceneId);
+
+    private native void storeScene(
+        long chipClusterPtr, StoreSceneResponseCallback callback, int groupId, int sceneId);
+
+    private native void viewScene(
+        long chipClusterPtr, ViewSceneResponseCallback callback, int groupId, int sceneId);
+
     public interface AddSceneResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      , int sceneId
-      );
-      
+      void onSuccess(int status, int groupId, int sceneId);
+
       void onError(Exception error);
     }
 
     public interface GetSceneMembershipResponseCallback {
-      void onSuccess(
-      int status
-      , int capacity
-      , int groupId
-      , int sceneCount
-      // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      );
-      
+      void onSuccess(int status, int capacity, int groupId, int sceneCount
+          // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          );
+
       void onError(Exception error);
     }
 
     public interface RemoveAllScenesResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      );
-      
+      void onSuccess(int status, int groupId);
+
       void onError(Exception error);
     }
 
     public interface RemoveSceneResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      , int sceneId
-      );
-      
+      void onSuccess(int status, int groupId, int sceneId);
+
       void onError(Exception error);
     }
 
     public interface StoreSceneResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      , int sceneId
-      );
-      
+      void onSuccess(int status, int groupId, int sceneId);
+
       void onError(Exception error);
     }
 
     public interface ViewSceneResponseCallback {
-      void onSuccess(
-      int status
-      , int groupId
-      , int sceneId
-      , int transitionTime
-      , String sceneName
-      // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      );
-      
+      void onSuccess(int status, int groupId, int sceneId, int transitionTime, String sceneName
+          // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          );
+
       void onError(Exception error);
     }
 
-
-
-    public void readSceneCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSceneCountAttribute(IntegerAttributeCallback callback) {
       readSceneCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentSceneAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentSceneAttribute(IntegerAttributeCallback callback) {
       readCurrentSceneAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentGroupAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentGroupAttribute(IntegerAttributeCallback callback) {
       readCurrentGroupAttribute(chipClusterPtr, callback);
     }
 
-    public void readSceneValidAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readSceneValidAttribute(BooleanAttributeCallback callback) {
       readSceneValidAttribute(chipClusterPtr, callback);
     }
 
-    public void readNameSupportAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNameSupportAttribute(IntegerAttributeCallback callback) {
       readNameSupportAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readSceneCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentSceneAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentGroupAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readSceneValidAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
-  
-    private native void readNameSupportAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  }
 
-  public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
-    public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
+    private native void readSceneCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCurrentSceneAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readCurrentGroupAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readSceneValidAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readNameSupportAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+  }
+
+  public static class SoftwareDiagnosticsCluster extends BaseChipCluster {
+    public SoftwareDiagnosticsCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
     public static long clusterId() {
       return Long.parseUnsignedLong("52");
@@ -5907,46 +6088,33 @@ public void resetWatermarks(DefaultClusterCallback callback) {
 
     private native void resetWatermarks(long chipClusterPtr, DefaultClusterCallback callback);
 
-
-    public void readCurrentHeapFreeAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readCurrentHeapFreeAttribute(LongAttributeCallback callback) {
       readCurrentHeapFreeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentHeapUsedAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readCurrentHeapUsedAttribute(LongAttributeCallback callback) {
       readCurrentHeapUsedAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentHeapHighWatermarkAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readCurrentHeapHighWatermarkAttribute(LongAttributeCallback callback) {
       readCurrentHeapHighWatermarkAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readCurrentHeapFreeAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readCurrentHeapUsedAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readCurrentHeapHighWatermarkAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readCurrentHeapFreeAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readCurrentHeapUsedAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readCurrentHeapHighWatermarkAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class SwitchCluster extends BaseChipCluster {
@@ -5961,20 +6129,16 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readNumberOfPositionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNumberOfPositionsAttribute(IntegerAttributeCallback callback) {
       readNumberOfPositionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeCurrentPositionAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeCurrentPositionAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5982,27 +6146,24 @@ public void reportCurrentPositionAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readNumberOfPositionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentPositionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeCurrentPositionAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readNumberOfPositionsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentPositionAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribeCurrentPositionAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportCurrentPositionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class TvChannelCluster extends BaseChipCluster {
@@ -6021,32 +6182,36 @@ public void changeChannel(ChangeChannelResponseCallback callback, String match)
       changeChannel(chipClusterPtr, callback, match);
     }
 
-
-    public void changeChannelByNumber(DefaultClusterCallback callback, int majorNumber, int minorNumber) {
+    public void changeChannelByNumber(
+        DefaultClusterCallback callback, int majorNumber, int minorNumber) {
       changeChannelByNumber(chipClusterPtr, callback, majorNumber, minorNumber);
     }
 
-
     public void skipChannel(DefaultClusterCallback callback, int count) {
       skipChannel(chipClusterPtr, callback, count);
     }
 
-    private native void changeChannel(long chipClusterPtr, ChangeChannelResponseCallback callback, String match);
-    private native void changeChannelByNumber(long chipClusterPtr, DefaultClusterCallback callback, int majorNumber, int minorNumber);
-    private native void skipChannel(long chipClusterPtr, DefaultClusterCallback callback, int count);
+    private native void changeChannel(
+        long chipClusterPtr, ChangeChannelResponseCallback callback, String match);
+
+    private native void changeChannelByNumber(
+        long chipClusterPtr, DefaultClusterCallback callback, int majorNumber, int minorNumber);
+
+    private native void skipChannel(
+        long chipClusterPtr, DefaultClusterCallback callback, int count);
+
     public interface ChangeChannelResponseCallback {
       void onSuccess(
-      // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      int ErrorType
-      );
-      
+          // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          int ErrorType);
+
       void onError(Exception error);
     }
 
-
     public static class TvChannelListAttribute {
       public int majorNumber;
+<<<<<<< HEAD
             public int minorNumber;
             public String name;
       public String callSign;
@@ -6059,6 +6224,19 @@ public TvChannelListAttribute(
         String callSign,
         String affiliateCallSign
       ) {
+=======
+      public int minorNumber;
+      public byte[] name;
+      public byte[] callSign;
+      public byte[] affiliateCallSign;
+
+      public TvChannelListAttribute(
+          int majorNumber,
+          int minorNumber,
+          byte[] name,
+          byte[] callSign,
+          byte[] affiliateCallSign) {
+>>>>>>> e993d01f0 (callback generation done)
         this.majorNumber = majorNumber;
         this.minorNumber = minorNumber;
         this.name = name;
@@ -6068,51 +6246,38 @@ public TvChannelListAttribute(
     }
 
     public interface TvChannelListAttributeCallback {
-      void onSuccess(List<
-      TvChannelListAttribute
-      > valueList);
+      void onSuccess(List<TvChannelListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readTvChannelListAttribute(
-      TvChannelListAttributeCallback callback
-    ) {
+    public void readTvChannelListAttribute(TvChannelListAttributeCallback callback) {
       readTvChannelListAttribute(chipClusterPtr, callback);
     }
 
-    public void readTvChannelLineupAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readTvChannelLineupAttribute(OctetStringAttributeCallback callback) {
       readTvChannelLineupAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentTvChannelAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readCurrentTvChannelAttribute(OctetStringAttributeCallback callback) {
       readCurrentTvChannelAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readTvChannelListAttribute(long chipClusterPtr,
-      TvChannelListAttributeCallback callback
-    );
-  
-    private native void readTvChannelLineupAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readCurrentTvChannelAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readTvChannelListAttribute(
+        long chipClusterPtr, TvChannelListAttributeCallback callback);
+
+    private native void readTvChannelLineupAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readCurrentTvChannelAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class TargetNavigatorCluster extends BaseChipCluster {
@@ -6131,56 +6296,53 @@ public void navigateTarget(NavigateTargetResponseCallback callback, int target,
       navigateTarget(chipClusterPtr, callback, target, data);
     }
 
-    private native void navigateTarget(long chipClusterPtr, NavigateTargetResponseCallback callback, int target, String data);
+    private native void navigateTarget(
+        long chipClusterPtr, NavigateTargetResponseCallback callback, int target, String data);
+
     public interface NavigateTargetResponseCallback {
-      void onSuccess(
-      int status
-      , String data
-      );
-      
+      void onSuccess(int status, String data);
+
       void onError(Exception error);
     }
 
-
     public static class TargetNavigatorListAttribute {
       public int identifier;
+<<<<<<< HEAD
             public String name;
 
       public TargetNavigatorListAttribute(
         int identifier,
                 String name
       ) {
+=======
+      public byte[] name;
+
+      public TargetNavigatorListAttribute(int identifier, byte[] name) {
+>>>>>>> e993d01f0 (callback generation done)
         this.identifier = identifier;
         this.name = name;
       }
     }
 
     public interface TargetNavigatorListAttributeCallback {
-      void onSuccess(List<
-      TargetNavigatorListAttribute
-      > valueList);
+      void onSuccess(List<TargetNavigatorListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readTargetNavigatorListAttribute(
-      TargetNavigatorListAttributeCallback callback
-    ) {
+    public void readTargetNavigatorListAttribute(TargetNavigatorListAttributeCallback callback) {
       readTargetNavigatorListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readTargetNavigatorListAttribute(long chipClusterPtr,
-      TargetNavigatorListAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readTargetNavigatorListAttribute(
+        long chipClusterPtr, TargetNavigatorListAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class TemperatureMeasurementCluster extends BaseChipCluster {
@@ -6195,14 +6357,12 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeMeasuredValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeMeasuredValueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeMeasuredValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -6210,18 +6370,15 @@ public void reportMeasuredValueAttribute(IntegerAttributeCallback callback) {
       reportMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMinMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxMeasuredValueAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
@@ -6242,16 +6399,19 @@ public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeMeasuredValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readMeasuredValueAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -6264,6 +6424,7 @@ private native void readMinMeasuredValueAttribute(
     private native void readMaxMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
     private native void readToleranceAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -6290,6 +6451,10 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class TestClusterCluster extends BaseChipCluster {
@@ -6308,24 +6473,32 @@ public void test(DefaultClusterCallback callback) {
       test(chipClusterPtr, callback);
     }
 
-
     public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1, int arg2) {
       testAddArguments(chipClusterPtr, callback, arg1, arg2);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
     }
+=======
+>>>>>>> 677ef48a5 (callback generation done)
 
 =======
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
 =======
 
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> e993d01f0 (callback generation done)
+>>>>>>> 677ef48a5 (callback generation done)
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
@@ -6341,10 +6514,17 @@ public void testListStructArgumentRequest(DefaultClusterCallback callback, int a
     }
 
 
+<<<<<<< HEAD
+=======
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
     public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void testNullableOptionalRequest(
         TestNullableOptionalResponseCallback callback, int arg1) {
@@ -6353,16 +6533,33 @@ public void testNullableOptionalRequest(
 =======
 >>>>>>> e83b94d19 (need to wait for cast-helper)
 
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 
     public void testStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+    public void testStructArgumentRequest(
+        DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
+>>>>>>> e993d01f0 (callback generation done)
       testStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
 
 
+<<<<<<< HEAD
+=======
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
     public void testUnknownCommand(DefaultClusterCallback callback) {
       testUnknownCommand(chipClusterPtr, callback);
     }
@@ -6371,6 +6568,7 @@ public void testUnknownCommand(DefaultClusterCallback callback) {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
@@ -6403,11 +6601,56 @@ private native void testListStructArgumentRequest(
 =======
 =======
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
     private native void testListInt8UArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int arg1);
     private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
     private native void testListStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+>>>>>>> 6e6e45a1a (callback generation done)
+
+    private native void testAddArguments(
+        long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
+
+<<<<<<< HEAD
+<<<<<<< HEAD
+    private native void testListInt8UArgumentRequest(
+        long chipClusterPtr, DefaultClusterCallback callback, int arg1);
+
+    private native void testListInt8UReverseRequest(
+        long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
+
+    private native void testListStructArgumentRequest(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int a,
+        boolean b,
+        int c,
+        byte[] d,
+        String e,
+        int f);
+
+=======
+    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
     private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     private native void testNullableOptionalRequest(
@@ -6415,19 +6658,49 @@ private native void testNullableOptionalRequest(
 
 =======
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+
+>>>>>>> 677ef48a5 (callback generation done)
     private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
+<<<<<<< HEAD
     private native void testStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
-    private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
-    public interface TestAddArgumentsResponseCallback {
-      void onSuccess(
-      int returnValue
-      );
-      
-      void onError(Exception error);
-    }
-
-    public interface TestEnumsResponseCallback {
-      void onSuccess(int arg1, int arg2);
+=======
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+<<<<<<< HEAD
+
+    private native void testStructArgumentRequest(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int a,
+        boolean b,
+        int c,
+        byte[] d,
+        String e,
+        int f);
+
+=======
+>>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
+=======
+
+>>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
+=======
+>>>>>>> d51f00a65 (need to wait for cast-helper)
+=======
+
+>>>>>>> 6e6e45a1a (callback generation done)
+>>>>>>> e993d01f0 (callback generation done)
+    private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
+
+    public interface TestAddArgumentsResponseCallback {
+      void onSuccess(int returnValue);
+
+      void onError(Exception error);
+    }
+
+    public interface TestEnumsResponseCallback {
+      void onSuccess(int arg1, int arg2);
 
       void onError(Exception error);
     }
@@ -6448,51 +6721,40 @@ public interface TestNullableOptionalResponseCallback {
     }
 
     public interface TestSpecificResponseCallback {
-      void onSuccess(
-      int returnValue
-      );
-      
+      void onSuccess(int returnValue);
+
       void onError(Exception error);
     }
 
-
-
     public interface ListInt8uAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
+      void onSuccess(List<Integer> valueList);
+
       void onError(Exception ex);
     }
 
     public interface ListOctetStringAttributeCallback {
-      void onSuccess(List<
-        byte[]
-      > valueList);
+      void onSuccess(List<byte[]> valueList);
+
       void onError(Exception ex);
     }
+
     public static class ListStructOctetStringAttribute {
       public long fabricIndex;
-            public byte[] operationalCert;
+      public byte[] operationalCert;
 
-      public ListStructOctetStringAttribute(
-        long fabricIndex,
-                byte[] operationalCert
-      ) {
+      public ListStructOctetStringAttribute(long fabricIndex, byte[] operationalCert) {
         this.fabricIndex = fabricIndex;
         this.operationalCert = operationalCert;
       }
     }
 
     public interface ListStructOctetStringAttributeCallback {
-      void onSuccess(List<
-      ListStructOctetStringAttribute
-      > valueList);
+      void onSuccess(List<ListStructOctetStringAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readBooleanAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readBooleanAttribute(BooleanAttributeCallback callback) {
       readBooleanAttribute(chipClusterPtr, callback);
     }
 
@@ -6500,9 +6762,7 @@ public void writeBooleanAttribute(DefaultClusterCallback callback, boolean value
       writeBooleanAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap8Attribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBitmap8Attribute(IntegerAttributeCallback callback) {
       readBitmap8Attribute(chipClusterPtr, callback);
     }
 
@@ -6510,9 +6770,7 @@ public void writeBitmap8Attribute(DefaultClusterCallback callback, int value) {
       writeBitmap8Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap16Attribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBitmap16Attribute(IntegerAttributeCallback callback) {
       readBitmap16Attribute(chipClusterPtr, callback);
     }
 
@@ -6520,9 +6778,7 @@ public void writeBitmap16Attribute(DefaultClusterCallback callback, int value) {
       writeBitmap16Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap32Attribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBitmap32Attribute(LongAttributeCallback callback) {
       readBitmap32Attribute(chipClusterPtr, callback);
     }
 
@@ -6530,9 +6786,7 @@ public void writeBitmap32Attribute(DefaultClusterCallback callback, long value)
       writeBitmap32Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readBitmap64Attribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBitmap64Attribute(LongAttributeCallback callback) {
       readBitmap64Attribute(chipClusterPtr, callback);
     }
 
@@ -6540,9 +6794,7 @@ public void writeBitmap64Attribute(DefaultClusterCallback callback, long value)
       writeBitmap64Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt8uAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInt8uAttribute(IntegerAttributeCallback callback) {
       readInt8uAttribute(chipClusterPtr, callback);
     }
 
@@ -6550,9 +6802,7 @@ public void writeInt8uAttribute(DefaultClusterCallback callback, int value) {
       writeInt8uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt16uAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInt16uAttribute(IntegerAttributeCallback callback) {
       readInt16uAttribute(chipClusterPtr, callback);
     }
 
@@ -6560,9 +6810,7 @@ public void writeInt16uAttribute(DefaultClusterCallback callback, int value) {
       writeInt16uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt32uAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readInt32uAttribute(LongAttributeCallback callback) {
       readInt32uAttribute(chipClusterPtr, callback);
     }
 
@@ -6570,9 +6818,7 @@ public void writeInt32uAttribute(DefaultClusterCallback callback, long value) {
       writeInt32uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt64uAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readInt64uAttribute(LongAttributeCallback callback) {
       readInt64uAttribute(chipClusterPtr, callback);
     }
 
@@ -6580,9 +6826,7 @@ public void writeInt64uAttribute(DefaultClusterCallback callback, long value) {
       writeInt64uAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt8sAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInt8sAttribute(IntegerAttributeCallback callback) {
       readInt8sAttribute(chipClusterPtr, callback);
     }
 
@@ -6590,9 +6834,7 @@ public void writeInt8sAttribute(DefaultClusterCallback callback, int value) {
       writeInt8sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt16sAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInt16sAttribute(IntegerAttributeCallback callback) {
       readInt16sAttribute(chipClusterPtr, callback);
     }
 
@@ -6600,9 +6842,7 @@ public void writeInt16sAttribute(DefaultClusterCallback callback, int value) {
       writeInt16sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt32sAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readInt32sAttribute(LongAttributeCallback callback) {
       readInt32sAttribute(chipClusterPtr, callback);
     }
 
@@ -6610,9 +6850,7 @@ public void writeInt32sAttribute(DefaultClusterCallback callback, long value) {
       writeInt32sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readInt64sAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readInt64sAttribute(LongAttributeCallback callback) {
       readInt64sAttribute(chipClusterPtr, callback);
     }
 
@@ -6620,9 +6858,7 @@ public void writeInt64sAttribute(DefaultClusterCallback callback, long value) {
       writeInt64sAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnum8Attribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEnum8Attribute(IntegerAttributeCallback callback) {
       readEnum8Attribute(chipClusterPtr, callback);
     }
 
@@ -6630,9 +6866,7 @@ public void writeEnum8Attribute(DefaultClusterCallback callback, int value) {
       writeEnum8Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readEnum16Attribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEnum16Attribute(IntegerAttributeCallback callback) {
       readEnum16Attribute(chipClusterPtr, callback);
     }
 
@@ -6640,9 +6874,7 @@ public void writeEnum16Attribute(DefaultClusterCallback callback, int value) {
       writeEnum16Attribute(chipClusterPtr, callback, value);
     }
 
-    public void readOctetStringAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readOctetStringAttribute(OctetStringAttributeCallback callback) {
       readOctetStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6650,27 +6882,20 @@ public void writeOctetStringAttribute(DefaultClusterCallback callback, byte[] va
       writeOctetStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readListInt8uAttribute(
-      ListInt8uAttributeCallback callback
-    ) {
+    public void readListInt8uAttribute(ListInt8uAttributeCallback callback) {
       readListInt8uAttribute(chipClusterPtr, callback);
     }
 
-    public void readListOctetStringAttribute(
-      ListOctetStringAttributeCallback callback
-    ) {
+    public void readListOctetStringAttribute(ListOctetStringAttributeCallback callback) {
       readListOctetStringAttribute(chipClusterPtr, callback);
     }
 
     public void readListStructOctetStringAttribute(
-      ListStructOctetStringAttributeCallback callback
-    ) {
+        ListStructOctetStringAttributeCallback callback) {
       readListStructOctetStringAttribute(chipClusterPtr, callback);
     }
 
-    public void readLongOctetStringAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readLongOctetStringAttribute(OctetStringAttributeCallback callback) {
       readLongOctetStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6678,9 +6903,7 @@ public void writeLongOctetStringAttribute(DefaultClusterCallback callback, byte[
       writeLongOctetStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readCharStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readCharStringAttribute(CharStringAttributeCallback callback) {
       readCharStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6688,9 +6911,7 @@ public void writeCharStringAttribute(DefaultClusterCallback callback, String val
       writeCharStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readLongCharStringAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readLongCharStringAttribute(CharStringAttributeCallback callback) {
       readLongCharStringAttribute(chipClusterPtr, callback);
     }
 
@@ -6698,9 +6919,7 @@ public void writeLongCharStringAttribute(DefaultClusterCallback callback, String
       writeLongCharStringAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEpochUsAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readEpochUsAttribute(LongAttributeCallback callback) {
       readEpochUsAttribute(chipClusterPtr, callback);
     }
 
@@ -6708,9 +6927,7 @@ public void writeEpochUsAttribute(DefaultClusterCallback callback, long value) {
       writeEpochUsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readEpochSAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readEpochSAttribute(LongAttributeCallback callback) {
       readEpochSAttribute(chipClusterPtr, callback);
     }
 
@@ -6718,6 +6935,7 @@ public void writeEpochSAttribute(DefaultClusterCallback callback, long value) {
       writeEpochSAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readVendorIdAttribute(IntegerAttributeCallback callback) {
       readVendorIdAttribute(chipClusterPtr, callback);
@@ -6733,6 +6951,9 @@ public void readUnsupportedAttribute(
       BooleanAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readUnsupportedAttribute(chipClusterPtr, callback);
     }
 
@@ -6740,155 +6961,69 @@ public void writeUnsupportedAttribute(DefaultClusterCallback callback, boolean v
       writeUnsupportedAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readBooleanAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
 
-    private native void writeBooleanAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-  
-    private native void readBitmap8Attribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readBooleanAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
 
-    private native void writeBitmap8Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readBitmap16Attribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeBooleanAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, boolean value);
 
-    private native void writeBitmap16Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readBitmap32Attribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void readBitmap8Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeBitmap32Attribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readBitmap64Attribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void writeBitmap8Attribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeBitmap64Attribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readInt8uAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readBitmap16Attribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeInt8uAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readInt16uAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeBitmap16Attribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeInt16uAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readInt32uAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void readBitmap32Attribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeInt32uAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readInt64uAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void writeBitmap32Attribute(
+        long chipClusterPtr, DefaultClusterCallback callback, long value);
 
-    private native void writeInt64uAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readInt8sAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readBitmap64Attribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeInt8sAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readInt16sAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeBitmap64Attribute(
+        long chipClusterPtr, DefaultClusterCallback callback, long value);
 
-    private native void writeInt16sAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readInt32sAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void readInt8uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeInt32sAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readInt64sAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void writeInt8uAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeInt64sAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readEnum8Attribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readInt16uAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeEnum8Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readEnum16Attribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeInt16uAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeEnum16Attribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOctetStringAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
+    private native void readInt32uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
-  
-    private native void readListInt8uAttribute(long chipClusterPtr,
-      ListInt8uAttributeCallback callback
-    );
-  
-    private native void readListOctetStringAttribute(long chipClusterPtr,
-      ListOctetStringAttributeCallback callback
-    );
-  
-    private native void readListStructOctetStringAttribute(long chipClusterPtr,
-      ListStructOctetStringAttributeCallback callback
-    );
-  
-    private native void readLongOctetStringAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
+    private native void writeInt32uAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, long value);
 
-    private native void writeLongOctetStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, byte[] value);
-  
-    private native void readCharStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
+    private native void readInt64uAttribute(long chipClusterPtr, LongAttributeCallback callback);
 
-    private native void writeCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
-  
-    private native void readLongCharStringAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
+    private native void writeInt64uAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, long value);
 
-    private native void writeLongCharStringAttribute(long chipClusterPtr, DefaultClusterCallback callback, String value);
-  
-    private native void readEpochUsAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void readInt8sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeEpochUsAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readEpochSAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
+    private native void writeInt8sAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeEpochSAttribute(long chipClusterPtr, DefaultClusterCallback callback, long value);
-  
-    private native void readUnsupportedAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
+    private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void writeInt16sAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
@@ -6955,12 +7090,15 @@ private native void writeEpochUsAttribute(
     private native void writeEpochSAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, long value);
 
+<<<<<<< HEAD
     private native void readVendorIdAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void writeVendorIdAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void readUnsupportedAttribute(
         long chipClusterPtr, BooleanAttributeCallback callback);
 
@@ -6969,6 +7107,7 @@ private native void writeUnsupportedAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+<<<<<<< HEAD
 =======
     private native void writeUnsupportedAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
   
@@ -6976,6 +7115,8 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ThermostatCluster extends BaseChipCluster {
@@ -6994,40 +7135,58 @@ public void clearWeeklySchedule(DefaultClusterCallback callback) {
       clearWeeklySchedule(chipClusterPtr, callback);
     }
 
-
     public void getRelayStatusLog(DefaultClusterCallback callback) {
       getRelayStatusLog(chipClusterPtr, callback);
     }
 
-
-    public void getWeeklySchedule(DefaultClusterCallback callback, int daysToReturn, int modeToReturn) {
+    public void getWeeklySchedule(
+        DefaultClusterCallback callback, int daysToReturn, int modeToReturn) {
       getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn);
     }
 
-
-    public void setWeeklySchedule(DefaultClusterCallback callback, int numberOfTransitionsForSequence, int dayOfWeekForSequence, int modeForSequence, int payload) {
-      setWeeklySchedule(chipClusterPtr, callback, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, payload);
+    public void setWeeklySchedule(
+        DefaultClusterCallback callback,
+        int numberOfTransitionsForSequence,
+        int dayOfWeekForSequence,
+        int modeForSequence,
+        int payload) {
+      setWeeklySchedule(
+          chipClusterPtr,
+          callback,
+          numberOfTransitionsForSequence,
+          dayOfWeekForSequence,
+          modeForSequence,
+          payload);
     }
 
-
     public void setpointRaiseLower(DefaultClusterCallback callback, int mode, int amount) {
       setpointRaiseLower(chipClusterPtr, callback, mode, amount);
     }
 
     private native void clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback);
+
     private native void getRelayStatusLog(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void getWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, int daysToReturn, int modeToReturn);
-    private native void setWeeklySchedule(long chipClusterPtr, DefaultClusterCallback callback, int numberOfTransitionsForSequence, int dayOfWeekForSequence, int modeForSequence, int payload);
-    private native void setpointRaiseLower(long chipClusterPtr, DefaultClusterCallback callback, int mode, int amount);
 
+    private native void getWeeklySchedule(
+        long chipClusterPtr, DefaultClusterCallback callback, int daysToReturn, int modeToReturn);
 
-    public void readLocalTemperatureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    private native void setWeeklySchedule(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int numberOfTransitionsForSequence,
+        int dayOfWeekForSequence,
+        int modeForSequence,
+        int payload);
+
+    private native void setpointRaiseLower(
+        long chipClusterPtr, DefaultClusterCallback callback, int mode, int amount);
+
+    public void readLocalTemperatureAttribute(IntegerAttributeCallback callback) {
       readLocalTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeLocalTemperatureAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeLocalTemperatureAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeLocalTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -7035,33 +7194,23 @@ public void reportLocalTemperatureAttribute(IntegerAttributeCallback callback) {
       reportLocalTemperatureAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMinHeatSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAbsMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readAbsMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMaxHeatSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAbsMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readAbsMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMinCoolSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAbsMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readAbsMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readAbsMaxCoolSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAbsMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readAbsMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
-    public void readOccupiedCoolingSetpointAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOccupiedCoolingSetpointAttribute(IntegerAttributeCallback callback) {
       readOccupiedCoolingSetpointAttribute(chipClusterPtr, callback);
     }
 
@@ -7069,9 +7218,7 @@ public void writeOccupiedCoolingSetpointAttribute(DefaultClusterCallback callbac
       writeOccupiedCoolingSetpointAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOccupiedHeatingSetpointAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOccupiedHeatingSetpointAttribute(IntegerAttributeCallback callback) {
       readOccupiedHeatingSetpointAttribute(chipClusterPtr, callback);
     }
 
@@ -7079,9 +7226,7 @@ public void writeOccupiedHeatingSetpointAttribute(DefaultClusterCallback callbac
       writeOccupiedHeatingSetpointAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMinHeatSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readMinHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -7089,9 +7234,7 @@ public void writeMinHeatSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMinHeatSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMaxHeatSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxHeatSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readMaxHeatSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -7099,9 +7242,7 @@ public void writeMaxHeatSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMaxHeatSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMinCoolSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readMinCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -7109,9 +7250,7 @@ public void writeMinCoolSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMinCoolSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readMaxCoolSetpointLimitAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxCoolSetpointLimitAttribute(IntegerAttributeCallback callback) {
       readMaxCoolSetpointLimitAttribute(chipClusterPtr, callback);
     }
 
@@ -7119,6 +7258,7 @@ public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readMinSetpointDeadBandAttribute(IntegerAttributeCallback callback) {
       readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
@@ -7134,16 +7274,18 @@ public void readControlSequenceOfOperationAttribute(
       IntegerAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
     }
 
-    public void writeControlSequenceOfOperationAttribute(DefaultClusterCallback callback, int value) {
+    public void writeControlSequenceOfOperationAttribute(
+        DefaultClusterCallback callback, int value) {
       writeControlSequenceOfOperationAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readSystemModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSystemModeAttribute(IntegerAttributeCallback callback) {
       readSystemModeAttribute(chipClusterPtr, callback);
     }
 
@@ -7151,107 +7293,57 @@ public void writeSystemModeAttribute(DefaultClusterCallback callback, int value)
       writeSystemModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartOfWeekAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStartOfWeekAttribute(IntegerAttributeCallback callback) {
       readStartOfWeekAttribute(chipClusterPtr, callback);
     }
 
-    public void readNumberOfWeeklyTransitionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNumberOfWeeklyTransitionsAttribute(IntegerAttributeCallback callback) {
       readNumberOfWeeklyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readNumberOfDailyTransitionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readNumberOfDailyTransitionsAttribute(IntegerAttributeCallback callback) {
       readNumberOfDailyTransitionsAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readLocalTemperatureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeLocalTemperatureAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readLocalTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportLocalTemperatureAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readAbsMinHeatSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readAbsMaxHeatSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readAbsMinCoolSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readAbsMaxCoolSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readOccupiedCoolingSetpointAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeLocalTemperatureAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void writeOccupiedCoolingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOccupiedHeatingSetpointAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportLocalTemperatureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeOccupiedHeatingSetpointAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readMinHeatSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readAbsMinHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMinHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readMaxHeatSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readAbsMaxHeatSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMaxHeatSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readMinCoolSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readAbsMinCoolSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMinCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readMaxCoolSetpointLimitAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readAbsMaxCoolSetpointLimitAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeMaxCoolSetpointLimitAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readControlSequenceOfOperationAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readOccupiedCoolingSetpointAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeControlSequenceOfOperationAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readSystemModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeOccupiedCoolingSetpointAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void readOccupiedHeatingSetpointAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -7282,12 +7374,15 @@ private native void readMaxCoolSetpointLimitAttribute(
     private native void writeMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
+<<<<<<< HEAD
     private native void readMinSetpointDeadBandAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void writeMinSetpointDeadBandAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void readControlSequenceOfOperationAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -7314,6 +7409,7 @@ private native void readFeatureMapAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+<<<<<<< HEAD
 =======
     private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
   
@@ -7337,6 +7433,8 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+>>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
@@ -7351,10 +7449,7 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readTemperatureDisplayModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readTemperatureDisplayModeAttribute(IntegerAttributeCallback callback) {
       readTemperatureDisplayModeAttribute(chipClusterPtr, callback);
     }
 
@@ -7362,9 +7457,7 @@ public void writeTemperatureDisplayModeAttribute(DefaultClusterCallback callback
       writeTemperatureDisplayModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readKeypadLockoutAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readKeypadLockoutAttribute(IntegerAttributeCallback callback) {
       readKeypadLockoutAttribute(chipClusterPtr, callback);
     }
 
@@ -7372,43 +7465,39 @@ public void writeKeypadLockoutAttribute(DefaultClusterCallback callback, int val
       writeKeypadLockoutAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readScheduleProgrammingVisibilityAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readScheduleProgrammingVisibilityAttribute(IntegerAttributeCallback callback) {
       readScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback);
     }
 
-    public void writeScheduleProgrammingVisibilityAttribute(DefaultClusterCallback callback, int value) {
+    public void writeScheduleProgrammingVisibilityAttribute(
+        DefaultClusterCallback callback, int value) {
       writeScheduleProgrammingVisibilityAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readTemperatureDisplayModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void writeTemperatureDisplayModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readKeypadLockoutAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readTemperatureDisplayModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeKeypadLockoutAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readScheduleProgrammingVisibilityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void writeTemperatureDisplayModeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-    private native void writeScheduleProgrammingVisibilityAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readKeypadLockoutAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeKeypadLockoutAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readScheduleProgrammingVisibilityAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeScheduleProgrammingVisibilityAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class ThreadNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -7431,36 +7520,35 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     public static class NeighborTableListAttribute {
       public long extAddress;
-            public long age;
-            public int rloc16;
-            public long linkFrameCounter;
-            public long mleFrameCounter;
-            public int lqi;
-            public int averageRssi;
-            public int lastRssi;
-            public int frameErrorRate;
-            public int messageErrorRate;
-            public boolean rxOnWhenIdle;
-            public boolean fullThreadDevice;
-            public boolean fullNetworkData;
-            public boolean isChild;
-      
+      public long age;
+      public int rloc16;
+      public long linkFrameCounter;
+      public long mleFrameCounter;
+      public int lqi;
+      public int averageRssi;
+      public int lastRssi;
+      public int frameErrorRate;
+      public int messageErrorRate;
+      public boolean rxOnWhenIdle;
+      public boolean fullThreadDevice;
+      public boolean fullNetworkData;
+      public boolean isChild;
+
       public NeighborTableListAttribute(
-        long extAddress,
-                long age,
-                int rloc16,
-                long linkFrameCounter,
-                long mleFrameCounter,
-                int lqi,
-                int averageRssi,
-                int lastRssi,
-                int frameErrorRate,
-                int messageErrorRate,
-                boolean rxOnWhenIdle,
-                boolean fullThreadDevice,
-                boolean fullNetworkData,
-                boolean isChild
-              ) {
+          long extAddress,
+          long age,
+          int rloc16,
+          long linkFrameCounter,
+          long mleFrameCounter,
+          int lqi,
+          int averageRssi,
+          int lastRssi,
+          int frameErrorRate,
+          int messageErrorRate,
+          boolean rxOnWhenIdle,
+          boolean fullThreadDevice,
+          boolean fullNetworkData,
+          boolean isChild) {
         this.extAddress = extAddress;
         this.age = age;
         this.rloc16 = rloc16;
@@ -7479,35 +7567,34 @@ public NeighborTableListAttribute(
     }
 
     public interface NeighborTableListAttributeCallback {
-      void onSuccess(List<
-      NeighborTableListAttribute
-      > valueList);
+      void onSuccess(List<NeighborTableListAttribute> valueList);
+
       void onError(Exception ex);
     }
+
     public static class RouteTableListAttribute {
       public long extAddress;
-            public int rloc16;
-            public int routerId;
-            public int nextHop;
-            public int pathCost;
-            public int LQIIn;
-            public int LQIOut;
-            public int age;
-            public boolean allocated;
-            public boolean linkEstablished;
-      
+      public int rloc16;
+      public int routerId;
+      public int nextHop;
+      public int pathCost;
+      public int LQIIn;
+      public int LQIOut;
+      public int age;
+      public boolean allocated;
+      public boolean linkEstablished;
+
       public RouteTableListAttribute(
-        long extAddress,
-                int rloc16,
-                int routerId,
-                int nextHop,
-                int pathCost,
-                int LQIIn,
-                int LQIOut,
-                int age,
-                boolean allocated,
-                boolean linkEstablished
-              ) {
+          long extAddress,
+          int rloc16,
+          int routerId,
+          int nextHop,
+          int pathCost,
+          int LQIIn,
+          int LQIOut,
+          int age,
+          boolean allocated,
+          boolean linkEstablished) {
         this.extAddress = extAddress;
         this.rloc16 = rloc16;
         this.routerId = routerId;
@@ -7522,58 +7609,54 @@ public RouteTableListAttribute(
     }
 
     public interface RouteTableListAttributeCallback {
-      void onSuccess(List<
-      RouteTableListAttribute
-      > valueList);
+      void onSuccess(List<RouteTableListAttribute> valueList);
+
       void onError(Exception ex);
     }
+
     public static class SecurityPolicyAttribute {
       public int rotationTime;
-            public int flags;
-      
-      public SecurityPolicyAttribute(
-        int rotationTime,
-                int flags
-              ) {
+      public int flags;
+
+      public SecurityPolicyAttribute(int rotationTime, int flags) {
         this.rotationTime = rotationTime;
         this.flags = flags;
       }
     }
 
     public interface SecurityPolicyAttributeCallback {
-      void onSuccess(List<
-      SecurityPolicyAttribute
-      > valueList);
+      void onSuccess(List<SecurityPolicyAttribute> valueList);
+
       void onError(Exception ex);
     }
+
     public static class OperationalDatasetComponentsAttribute {
       public boolean activeTimestampPresent;
-            public boolean pendingTimestampPresent;
-            public boolean masterKeyPresent;
-            public boolean networkNamePresent;
-            public boolean extendedPanIdPresent;
-            public boolean meshLocalPrefixPresent;
-            public boolean delayPresent;
-            public boolean panIdPresent;
-            public boolean channelPresent;
-            public boolean pskcPresent;
-            public boolean securityPolicyPresent;
-            public boolean channelMaskPresent;
-      
+      public boolean pendingTimestampPresent;
+      public boolean masterKeyPresent;
+      public boolean networkNamePresent;
+      public boolean extendedPanIdPresent;
+      public boolean meshLocalPrefixPresent;
+      public boolean delayPresent;
+      public boolean panIdPresent;
+      public boolean channelPresent;
+      public boolean pskcPresent;
+      public boolean securityPolicyPresent;
+      public boolean channelMaskPresent;
+
       public OperationalDatasetComponentsAttribute(
-        boolean activeTimestampPresent,
-                boolean pendingTimestampPresent,
-                boolean masterKeyPresent,
-                boolean networkNamePresent,
-                boolean extendedPanIdPresent,
-                boolean meshLocalPrefixPresent,
-                boolean delayPresent,
-                boolean panIdPresent,
-                boolean channelPresent,
-                boolean pskcPresent,
-                boolean securityPolicyPresent,
-                boolean channelMaskPresent
-              ) {
+          boolean activeTimestampPresent,
+          boolean pendingTimestampPresent,
+          boolean masterKeyPresent,
+          boolean networkNamePresent,
+          boolean extendedPanIdPresent,
+          boolean meshLocalPrefixPresent,
+          boolean delayPresent,
+          boolean panIdPresent,
+          boolean channelPresent,
+          boolean pskcPresent,
+          boolean securityPolicyPresent,
+          boolean channelMaskPresent) {
         this.activeTimestampPresent = activeTimestampPresent;
         this.pendingTimestampPresent = pendingTimestampPresent;
         this.masterKeyPresent = masterKeyPresent;
@@ -7590,658 +7673,464 @@ public OperationalDatasetComponentsAttribute(
     }
 
     public interface OperationalDatasetComponentsAttributeCallback {
-      void onSuccess(List<
-      OperationalDatasetComponentsAttribute
-      > valueList);
+      void onSuccess(List<OperationalDatasetComponentsAttribute> valueList);
+
       void onError(Exception ex);
     }
 
     public interface ActiveNetworkFaultsListAttributeCallback {
-      void onSuccess(List<
-        Integer
-              > valueList);
+      void onSuccess(List<Integer> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readChannelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readChannelAttribute(IntegerAttributeCallback callback) {
       readChannelAttribute(chipClusterPtr, callback);
     }
 
-    public void readRoutingRoleAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRoutingRoleAttribute(IntegerAttributeCallback callback) {
       readRoutingRoleAttribute(chipClusterPtr, callback);
     }
 
-    public void readNetworkNameAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readNetworkNameAttribute(OctetStringAttributeCallback callback) {
       readNetworkNameAttribute(chipClusterPtr, callback);
     }
 
-    public void readPanIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPanIdAttribute(IntegerAttributeCallback callback) {
       readPanIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readExtendedPanIdAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readExtendedPanIdAttribute(LongAttributeCallback callback) {
       readExtendedPanIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readMeshLocalPrefixAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readMeshLocalPrefixAttribute(OctetStringAttributeCallback callback) {
       readMeshLocalPrefixAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readNeighborTableListAttribute(
-      NeighborTableListAttributeCallback callback
-    ) {
+    public void readNeighborTableListAttribute(NeighborTableListAttributeCallback callback) {
       readNeighborTableListAttribute(chipClusterPtr, callback);
     }
 
-    public void readRouteTableListAttribute(
-      RouteTableListAttributeCallback callback
-    ) {
+    public void readRouteTableListAttribute(RouteTableListAttributeCallback callback) {
       readRouteTableListAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartitionIdAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPartitionIdAttribute(LongAttributeCallback callback) {
       readPartitionIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readWeightingAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readWeightingAttribute(IntegerAttributeCallback callback) {
       readWeightingAttribute(chipClusterPtr, callback);
     }
 
-    public void readDataVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readDataVersionAttribute(IntegerAttributeCallback callback) {
       readDataVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readStableDataVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStableDataVersionAttribute(IntegerAttributeCallback callback) {
       readStableDataVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readLeaderRouterIdAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readLeaderRouterIdAttribute(IntegerAttributeCallback callback) {
       readLeaderRouterIdAttribute(chipClusterPtr, callback);
     }
 
-    public void readDetachedRoleCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readDetachedRoleCountAttribute(IntegerAttributeCallback callback) {
       readDetachedRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readChildRoleCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readChildRoleCountAttribute(IntegerAttributeCallback callback) {
       readChildRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRouterRoleCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRouterRoleCountAttribute(IntegerAttributeCallback callback) {
       readRouterRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readLeaderRoleCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readLeaderRoleCountAttribute(IntegerAttributeCallback callback) {
       readLeaderRoleCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readAttachAttemptCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
       readAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPartitionIdChangeCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPartitionIdChangeCountAttribute(IntegerAttributeCallback callback) {
       readPartitionIdChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readBetterPartitionAttachAttemptCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readBetterPartitionAttachAttemptCountAttribute(IntegerAttributeCallback callback) {
       readBetterPartitionAttachAttemptCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readParentChangeCountAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readParentChangeCountAttribute(IntegerAttributeCallback callback) {
       readParentChangeCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxTotalCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxTotalCountAttribute(LongAttributeCallback callback) {
       readTxTotalCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxUnicastCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxUnicastCountAttribute(LongAttributeCallback callback) {
       readTxUnicastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBroadcastCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxBroadcastCountAttribute(LongAttributeCallback callback) {
       readTxBroadcastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxAckRequestedCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxAckRequestedCountAttribute(LongAttributeCallback callback) {
       readTxAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxAckedCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxAckedCountAttribute(LongAttributeCallback callback) {
       readTxAckedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxNoAckRequestedCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxNoAckRequestedCountAttribute(LongAttributeCallback callback) {
       readTxNoAckRequestedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDataCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxDataCountAttribute(LongAttributeCallback callback) {
       readTxDataCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDataPollCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxDataPollCountAttribute(LongAttributeCallback callback) {
       readTxDataPollCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBeaconCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxBeaconCountAttribute(LongAttributeCallback callback) {
       readTxBeaconCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxBeaconRequestCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxBeaconRequestCountAttribute(LongAttributeCallback callback) {
       readTxBeaconRequestCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxOtherCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxOtherCountAttribute(LongAttributeCallback callback) {
       readTxOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxRetryCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxRetryCountAttribute(LongAttributeCallback callback) {
       readTxRetryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxDirectMaxRetryExpiryCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxDirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
       readTxDirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxIndirectMaxRetryExpiryCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxIndirectMaxRetryExpiryCountAttribute(LongAttributeCallback callback) {
       readTxIndirectMaxRetryExpiryCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrCcaCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxErrCcaCountAttribute(LongAttributeCallback callback) {
       readTxErrCcaCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrAbortCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxErrAbortCountAttribute(LongAttributeCallback callback) {
       readTxErrAbortCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readTxErrBusyChannelCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readTxErrBusyChannelCountAttribute(LongAttributeCallback callback) {
       readTxErrBusyChannelCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxTotalCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxTotalCountAttribute(LongAttributeCallback callback) {
       readRxTotalCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxUnicastCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxUnicastCountAttribute(LongAttributeCallback callback) {
       readRxUnicastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBroadcastCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxBroadcastCountAttribute(LongAttributeCallback callback) {
       readRxBroadcastCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDataCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxDataCountAttribute(LongAttributeCallback callback) {
       readRxDataCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDataPollCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxDataPollCountAttribute(LongAttributeCallback callback) {
       readRxDataPollCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBeaconCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxBeaconCountAttribute(LongAttributeCallback callback) {
       readRxBeaconCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxBeaconRequestCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxBeaconRequestCountAttribute(LongAttributeCallback callback) {
       readRxBeaconRequestCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxOtherCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxOtherCountAttribute(LongAttributeCallback callback) {
       readRxOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxAddressFilteredCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxAddressFilteredCountAttribute(LongAttributeCallback callback) {
       readRxAddressFilteredCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDestAddrFilteredCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxDestAddrFilteredCountAttribute(LongAttributeCallback callback) {
       readRxDestAddrFilteredCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxDuplicatedCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxDuplicatedCountAttribute(LongAttributeCallback callback) {
       readRxDuplicatedCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrNoFrameCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrNoFrameCountAttribute(LongAttributeCallback callback) {
       readRxErrNoFrameCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrUnknownNeighborCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrUnknownNeighborCountAttribute(LongAttributeCallback callback) {
       readRxErrUnknownNeighborCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrInvalidSrcAddrCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrInvalidSrcAddrCountAttribute(LongAttributeCallback callback) {
       readRxErrInvalidSrcAddrCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrSecCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrSecCountAttribute(LongAttributeCallback callback) {
       readRxErrSecCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrFcsCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrFcsCountAttribute(LongAttributeCallback callback) {
       readRxErrFcsCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readRxErrOtherCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readRxErrOtherCountAttribute(LongAttributeCallback callback) {
       readRxErrOtherCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readActiveTimestampAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readActiveTimestampAttribute(LongAttributeCallback callback) {
       readActiveTimestampAttribute(chipClusterPtr, callback);
     }
 
-    public void readPendingTimestampAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPendingTimestampAttribute(LongAttributeCallback callback) {
       readPendingTimestampAttribute(chipClusterPtr, callback);
     }
 
-    public void readDelayAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readDelayAttribute(LongAttributeCallback callback) {
       readDelayAttribute(chipClusterPtr, callback);
     }
 
-    public void readSecurityPolicyAttribute(
-      SecurityPolicyAttributeCallback callback
-    ) {
+    public void readSecurityPolicyAttribute(SecurityPolicyAttributeCallback callback) {
       readSecurityPolicyAttribute(chipClusterPtr, callback);
     }
 
-    public void readChannelMaskAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readChannelMaskAttribute(OctetStringAttributeCallback callback) {
       readChannelMaskAttribute(chipClusterPtr, callback);
     }
 
     public void readOperationalDatasetComponentsAttribute(
-      OperationalDatasetComponentsAttributeCallback callback
-    ) {
+        OperationalDatasetComponentsAttributeCallback callback) {
       readOperationalDatasetComponentsAttribute(chipClusterPtr, callback);
     }
 
     public void readActiveNetworkFaultsListAttribute(
-      ActiveNetworkFaultsListAttributeCallback callback
-    ) {
+        ActiveNetworkFaultsListAttributeCallback callback) {
       readActiveNetworkFaultsListAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readChannelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRoutingRoleAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readNetworkNameAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readPanIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readExtendedPanIdAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readMeshLocalPrefixAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readOverrunCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readNeighborTableListAttribute(long chipClusterPtr,
-      NeighborTableListAttributeCallback callback
-    );
-  
-    private native void readRouteTableListAttribute(long chipClusterPtr,
-      RouteTableListAttributeCallback callback
-    );
-  
-    private native void readPartitionIdAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readWeightingAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readDataVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readStableDataVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readLeaderRouterIdAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readDetachedRoleCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readChildRoleCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRouterRoleCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readLeaderRoleCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readAttachAttemptCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPartitionIdChangeCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBetterPartitionAttachAttemptCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readParentChangeCountAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readTxTotalCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxUnicastCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxBroadcastCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxAckRequestedCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxAckedCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxNoAckRequestedCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxDataCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxDataPollCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxBeaconCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxBeaconRequestCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxOtherCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxRetryCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxDirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxIndirectMaxRetryExpiryCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxErrCcaCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxErrAbortCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readTxErrBusyChannelCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxTotalCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxUnicastCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxBroadcastCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxDataCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxDataPollCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxBeaconCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxBeaconRequestCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxOtherCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxAddressFilteredCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxDestAddrFilteredCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxDuplicatedCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrNoFrameCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrUnknownNeighborCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrInvalidSrcAddrCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrSecCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrFcsCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readRxErrOtherCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readActiveTimestampAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPendingTimestampAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readDelayAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readSecurityPolicyAttribute(long chipClusterPtr,
-      SecurityPolicyAttributeCallback callback
-    );
-  
-    private native void readChannelMaskAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readOperationalDatasetComponentsAttribute(long chipClusterPtr,
-      OperationalDatasetComponentsAttributeCallback callback
-    );
-  
-    private native void readActiveNetworkFaultsListAttribute(long chipClusterPtr,
-      ActiveNetworkFaultsListAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readChannelAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRoutingRoleAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readNetworkNameAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readPanIdAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readExtendedPanIdAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readMeshLocalPrefixAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readNeighborTableListAttribute(
+        long chipClusterPtr, NeighborTableListAttributeCallback callback);
+
+    private native void readRouteTableListAttribute(
+        long chipClusterPtr, RouteTableListAttributeCallback callback);
+
+    private native void readPartitionIdAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readWeightingAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readDataVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readStableDataVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readLeaderRouterIdAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readDetachedRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readChildRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRouterRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readLeaderRoleCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readPartitionIdChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBetterPartitionAttachAttemptCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readParentChangeCountAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readTxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxAckedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxNoAckRequestedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxDataPollCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxRetryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxDirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxIndirectMaxRetryExpiryCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxErrCcaCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxErrAbortCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readTxErrBusyChannelCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxTotalCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxUnicastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxBroadcastCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxDataCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxDataPollCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxBeaconCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxBeaconRequestCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxAddressFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxDestAddrFilteredCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxDuplicatedCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrNoFrameCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrUnknownNeighborCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrInvalidSrcAddrCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrSecCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrFcsCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readRxErrOtherCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readActiveTimestampAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPendingTimestampAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readDelayAttribute(long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readSecurityPolicyAttribute(
+        long chipClusterPtr, SecurityPolicyAttributeCallback callback);
+
+    private native void readChannelMaskAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readOperationalDatasetComponentsAttribute(
+        long chipClusterPtr, OperationalDatasetComponentsAttributeCallback callback);
+
+    private native void readActiveNetworkFaultsListAttribute(
+        long chipClusterPtr, ActiveNetworkFaultsListAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class WakeOnLanCluster extends BaseChipCluster {
@@ -8255,27 +8144,20 @@ public static long clusterId() {
 
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
-
-
-    public void readWakeOnLanMacAddressAttribute(
-      CharStringAttributeCallback callback
-    ) {
+
+    public void readWakeOnLanMacAddressAttribute(CharStringAttributeCallback callback) {
       readWakeOnLanMacAddressAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readWakeOnLanMacAddressAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readWakeOnLanMacAddressAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class WiFiNetworkDiagnosticsCluster extends BaseChipCluster {
@@ -8296,146 +8178,102 @@ public void resetCounts(DefaultClusterCallback callback) {
 
     private native void resetCounts(long chipClusterPtr, DefaultClusterCallback callback);
 
-
-    public void readBssidAttribute(
-      OctetStringAttributeCallback callback
-    ) {
+    public void readBssidAttribute(OctetStringAttributeCallback callback) {
       readBssidAttribute(chipClusterPtr, callback);
     }
 
-    public void readSecurityTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSecurityTypeAttribute(IntegerAttributeCallback callback) {
       readSecurityTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readWiFiVersionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readWiFiVersionAttribute(IntegerAttributeCallback callback) {
       readWiFiVersionAttribute(chipClusterPtr, callback);
     }
 
-    public void readChannelNumberAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readChannelNumberAttribute(IntegerAttributeCallback callback) {
       readChannelNumberAttribute(chipClusterPtr, callback);
     }
 
-    public void readRssiAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readRssiAttribute(IntegerAttributeCallback callback) {
       readRssiAttribute(chipClusterPtr, callback);
     }
 
-    public void readBeaconLostCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBeaconLostCountAttribute(LongAttributeCallback callback) {
       readBeaconLostCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readBeaconRxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readBeaconRxCountAttribute(LongAttributeCallback callback) {
       readBeaconRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketMulticastRxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketMulticastRxCountAttribute(LongAttributeCallback callback) {
       readPacketMulticastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketMulticastTxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketMulticastTxCountAttribute(LongAttributeCallback callback) {
       readPacketMulticastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketUnicastRxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketUnicastRxCountAttribute(LongAttributeCallback callback) {
       readPacketUnicastRxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readPacketUnicastTxCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readPacketUnicastTxCountAttribute(LongAttributeCallback callback) {
       readPacketUnicastTxCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentMaxRateAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readCurrentMaxRateAttribute(LongAttributeCallback callback) {
       readCurrentMaxRateAttribute(chipClusterPtr, callback);
     }
 
-    public void readOverrunCountAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readOverrunCountAttribute(LongAttributeCallback callback) {
       readOverrunCountAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readBssidAttribute(long chipClusterPtr,
-      OctetStringAttributeCallback callback
-    );
-  
-    private native void readSecurityTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readWiFiVersionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readChannelNumberAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readRssiAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readBeaconLostCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readBeaconRxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPacketMulticastRxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPacketMulticastTxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPacketUnicastRxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readPacketUnicastTxCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readCurrentMaxRateAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readOverrunCountAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readBssidAttribute(
+        long chipClusterPtr, OctetStringAttributeCallback callback);
+
+    private native void readSecurityTypeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readWiFiVersionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readChannelNumberAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readRssiAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readBeaconLostCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readBeaconRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPacketMulticastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPacketMulticastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPacketUnicastRxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readPacketUnicastTxCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readCurrentMaxRateAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readOverrunCountAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class WindowCoveringCluster extends BaseChipCluster {
@@ -8454,104 +8292,106 @@ public void downOrClose(DefaultClusterCallback callback) {
       downOrClose(chipClusterPtr, callback);
     }
 
-
-    public void goToLiftPercentage(DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue) {
+    public void goToLiftPercentage(
+        DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue) {
       goToLiftPercentage(chipClusterPtr, callback, liftPercentageValue, liftPercent100thsValue);
     }
 
-
     public void goToLiftValue(DefaultClusterCallback callback, int liftValue) {
       goToLiftValue(chipClusterPtr, callback, liftValue);
     }
 
-
-    public void goToTiltPercentage(DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue) {
+    public void goToTiltPercentage(
+        DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue) {
       goToTiltPercentage(chipClusterPtr, callback, tiltPercentageValue, tiltPercent100thsValue);
     }
 
-
     public void goToTiltValue(DefaultClusterCallback callback, int tiltValue) {
       goToTiltValue(chipClusterPtr, callback, tiltValue);
     }
 
-
     public void stopMotion(DefaultClusterCallback callback) {
       stopMotion(chipClusterPtr, callback);
     }
 
-
     public void upOrOpen(DefaultClusterCallback callback) {
       upOrOpen(chipClusterPtr, callback);
     }
 
     private native void downOrClose(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void goToLiftPercentage(long chipClusterPtr, DefaultClusterCallback callback, int liftPercentageValue, int liftPercent100thsValue);
-    private native void goToLiftValue(long chipClusterPtr, DefaultClusterCallback callback, int liftValue);
-    private native void goToTiltPercentage(long chipClusterPtr, DefaultClusterCallback callback, int tiltPercentageValue, int tiltPercent100thsValue);
-    private native void goToTiltValue(long chipClusterPtr, DefaultClusterCallback callback, int tiltValue);
+
+    private native void goToLiftPercentage(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int liftPercentageValue,
+        int liftPercent100thsValue);
+
+    private native void goToLiftValue(
+        long chipClusterPtr, DefaultClusterCallback callback, int liftValue);
+
+    private native void goToTiltPercentage(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int tiltPercentageValue,
+        int tiltPercent100thsValue);
+
+    private native void goToTiltValue(
+        long chipClusterPtr, DefaultClusterCallback callback, int tiltValue);
+
     private native void stopMotion(long chipClusterPtr, DefaultClusterCallback callback);
-    private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback callback);
 
+    private native void upOrOpen(long chipClusterPtr, DefaultClusterCallback callback);
 
-    public void readTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readTypeAttribute(IntegerAttributeCallback callback) {
       readTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionLiftAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionTiltAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readConfigStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readConfigStatusAttribute(IntegerAttributeCallback callback) {
       readConfigStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftPercentageAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionLiftPercentageAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionLiftPercentageAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionLiftPercentageAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercentageAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionLiftPercentageAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionLiftPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltPercentageAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionTiltPercentageAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionTiltPercentageAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercentageAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercentageAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionTiltPercentageAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionTiltPercentageAttribute(chipClusterPtr, callback);
     }
 
-    public void readOperationalStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOperationalStatusAttribute(IntegerAttributeCallback callback) {
       readOperationalStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeOperationalStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeOperationalStatusAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeOperationalStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -8559,95 +8399,83 @@ public void reportOperationalStatusAttribute(IntegerAttributeCallback callback)
       reportOperationalStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readTargetPositionLiftPercent100thsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readTargetPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       readTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTargetPositionLiftPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetPositionLiftPercent100thsAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetPositionLiftPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportTargetPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportTargetPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readTargetPositionTiltPercent100thsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readTargetPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       readTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeTargetPositionTiltPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeTargetPositionTiltPercent100thsAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeTargetPositionTiltPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportTargetPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportTargetPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readEndProductTypeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readEndProductTypeAttribute(IntegerAttributeCallback callback) {
       readEndProductTypeAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionLiftPercent100thsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionLiftPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionLiftPercent100thsAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionLiftPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionLiftPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionLiftPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentPositionTiltPercent100thsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       readCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeCurrentPositionTiltPercent100thsAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
-      subscribeCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+    public void subscribeCurrentPositionTiltPercent100thsAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
+      subscribeCurrentPositionTiltPercent100thsAttribute(
+          chipClusterPtr, callback, minInterval, maxInterval);
     }
 
     public void reportCurrentPositionTiltPercent100thsAttribute(IntegerAttributeCallback callback) {
       reportCurrentPositionTiltPercent100thsAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledOpenLimitLiftAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInstalledOpenLimitLiftAttribute(IntegerAttributeCallback callback) {
       readInstalledOpenLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledClosedLimitLiftAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInstalledClosedLimitLiftAttribute(IntegerAttributeCallback callback) {
       readInstalledClosedLimitLiftAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledOpenLimitTiltAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInstalledOpenLimitTiltAttribute(IntegerAttributeCallback callback) {
       readInstalledOpenLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readInstalledClosedLimitTiltAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readInstalledClosedLimitTiltAttribute(IntegerAttributeCallback callback) {
       readInstalledClosedLimitTiltAttribute(chipClusterPtr, callback);
     }
 
-    public void readModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readModeAttribute(IntegerAttributeCallback callback) {
       readModeAttribute(chipClusterPtr, callback);
     }
 
@@ -8655,13 +8483,12 @@ public void writeModeAttribute(DefaultClusterCallback callback, int value) {
       writeModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readSafetyStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSafetyStatusAttribute(IntegerAttributeCallback callback) {
       readSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeSafetyStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeSafetyStatusAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeSafetyStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -8669,6 +8496,7 @@ public void reportSafetyStatusAttribute(IntegerAttributeCallback callback) {
       reportSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
@@ -8680,114 +8508,63 @@ public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentPositionLiftAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentPositionTiltAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readConfigStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentPositionLiftPercentageAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
 
-    private native void subscribeCurrentPositionLiftPercentageAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readTypeAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentPositionLiftPercentageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readCurrentPositionTiltPercentageAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentPositionLiftAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentPositionTiltPercentageAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readCurrentPositionTiltAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentPositionTiltPercentageAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readOperationalStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readConfigStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeOperationalStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readCurrentPositionLiftPercentageAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportOperationalStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readTargetPositionLiftPercent100thsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeCurrentPositionLiftPercentageAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportCurrentPositionLiftPercentageAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportTargetPositionLiftPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readTargetPositionTiltPercent100thsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readCurrentPositionTiltPercentageAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void subscribeCurrentPositionTiltPercentageAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportTargetPositionTiltPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readEndProductTypeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportCurrentPositionTiltPercentageAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void subscribeCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readOperationalStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentPositionLiftPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeOperationalStatusAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportOperationalStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void reportCurrentPositionTiltPercent100thsAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readInstalledOpenLimitLiftAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readInstalledClosedLimitLiftAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readInstalledOpenLimitTiltAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readInstalledClosedLimitTiltAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void readTargetPositionLiftPercent100thsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
-    private native void writeModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readSafetyStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void subscribeTargetPositionLiftPercent100thsAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void subscribeSafetyStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void reportTargetPositionLiftPercent100thsAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 677ef48a5 (callback generation done)
     private native void readTargetPositionTiltPercent100thsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -8844,6 +8621,7 @@ private native void subscribeSafetyStatusAttribute(
     private native void reportSafetyStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
     private native void readFeatureMapAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
@@ -8856,5 +8634,9 @@ private native void readClusterRevisionAttribute(long chipClusterPtr,
       IntegerAttributeCallback callback
     );
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+>>>>>>> 677ef48a5 (callback generation done)
   }
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 620610c9319f1e..0836d9df99081a 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -22,6 +22,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 import chip.clusterinfo.ClusterCommandCallback;
 =======
 import java.util.*;
@@ -7499,18 +7500,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
 import chip.clusterinfo.ClusterCommandCallback;
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+import chip.clusterinfo.ClusterCommandCallback;
+>>>>>>> 677ef48a5 (callback generation done)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameter;
-import chip.clusterinfo.ParameterType;
 import chip.clusterinfo.DelegatedClusterCallback;
-import chip.clusterinfo.ClusterCommandCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-
+import java.util.*;
 
 public class ClusterInfoMapping {
 
-  class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
+  class DelegatedDefaultClusterCallback
+      implements DefaultClusterCallback, DelegatedClusterCallback {
     private ClusterCommandCallback callback;
 
     @Override
@@ -7518,7 +7521,8 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
       this.callback = callback;
     }
 
-    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
+    // Parameters and list-adds here should be generated - refer to the template code that creates
+    // each callback interface.
     @Override
     public void onSuccess() {
       List<Object> responseValues = new ArrayList<>();
@@ -7531,6 +7535,7 @@ public void onError(Exception e) {
     }
   }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   public Map<String, ClusterInfo> getClusterMap() {
     Map<String, ClusterInfo> clusterMap = new HashMap<>();
@@ -7541,172 +7546,2115 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter getSetupPIN_tempAccountIdentifier_commandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
     accountLogin_getSetupPIN_commandParams.add(getSetupPIN_tempAccountIdentifier_commandParameter);
+=======
+  public class DelegatedGetSetupPINResponseCallback
+      implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
 
-    // Populate commands
-    CommandInfo accountLogin_getSetupPIN_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            accountLogin_getSetupPIN_commandParams);
-    accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
-    List<CommandParameter> accountLogin_login_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
 
-    CommandParameter login_tempAccountIdentifier_commandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_login_commandParams.add(login_tempAccountIdentifier_commandParameter);
+    @Override
+    public void onSuccess(String setupPIN) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(setupPIN);
+      callback.onSuccess(responseValues);
+    }
 
-    CommandParameter login_setupPIN_commandParameter =
-        new CommandParameter("setupPIN", String.class);
-    accountLogin_login_commandParams.add(login_setupPIN_commandParameter);
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
 
-    // Populate commands
-    CommandInfo accountLogin_login_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            accountLogin_login_commandParams);
-    accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
-    // Populate cluster
-    ClusterInfo accountLogin_clusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
-            accountLogin_ClusterCommandInfo);
-    clusterMap.put("accountLogin", accountLogin_clusterInfo);
-    Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
-    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
+  public class DelegatedLaunchAppResponseCallback
+      implements ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
 
-    CommandParameter openBasicCommissioningWindow_commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openBasicCommissioningWindow_commandParams.add(
-        openBasicCommissioningWindow_commissioningTimeout_commandParameter);
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
 
-    // Populate commands
-    CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioning_openBasicCommissioningWindow_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
-        "openBasicCommissioningWindow",
-        administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
-    List<CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
+    @Override
+    public void onSuccess(int status, String data) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(data);
+      callback.onSuccess(responseValues);
+    }
 
-    CommandParameter openCommissioningWindow_commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_commissioningTimeout_commandParameter);
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
 
-    CommandParameter openCommissioningWindow_PAKEVerifier_commandParameter =
-        new CommandParameter("PAKEVerifier", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_PAKEVerifier_commandParameter);
+  public class DelegatedLaunchContentResponseCallback
+      implements ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
 
-    CommandParameter openCommissioningWindow_discriminator_commandParameter =
-        new CommandParameter("discriminator", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_discriminator_commandParameter);
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
 
-    CommandParameter openCommissioningWindow_iterations_commandParameter =
-        new CommandParameter("iterations", long.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_iterations_commandParameter);
+    @Override
+    public void onSuccess(String data, int contentLaunchStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(data);
+      responseValues.add(contentLaunchStatus);
+      callback.onSuccess(responseValues);
+    }
 
-    CommandParameter openCommissioningWindow_salt_commandParameter =
-        new CommandParameter("salt", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_salt_commandParameter);
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
 
-    CommandParameter openCommissioningWindow_passcodeID_commandParameter =
-        new CommandParameter("passcodeID", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_passcodeID_commandParameter);
+  public class DelegatedLaunchURLResponseCallback
+      implements ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
 
-    // Populate commands
-    CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioning_openCommissioningWindow_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
-        "openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
-    List<CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
 
-    // Populate commands
-    CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioning_revokeCommissioning_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
-        "revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
-    // Populate cluster
-    ClusterInfo administratorCommissioning_clusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
-            administratorCommissioning_ClusterCommandInfo);
-    clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
-    Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
-    List<CommandParameter> applicationBasic_changeStatus_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
+    @Override
+    public void onSuccess(String data, int contentLaunchStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(data);
+      responseValues.add(contentLaunchStatus);
+      callback.onSuccess(responseValues);
+    }
 
-    CommandParameter changeStatus_status_commandParameter =
-        new CommandParameter("status", int.class);
-    applicationBasic_changeStatus_commandParams.add(changeStatus_status_commandParameter);
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
 
-    // Populate commands
-    CommandInfo applicationBasic_changeStatus_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            applicationBasic_changeStatus_commandParams);
-    applicationBasic_ClusterCommandInfo.put(
-        "changeStatus", applicationBasic_changeStatus_CommandInfo);
-    // Populate cluster
-    ClusterInfo applicationBasic_clusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
-            applicationBasic_ClusterCommandInfo);
-    clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
-    Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
-    List<CommandParameter> applicationLauncher_launchApp_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
+  public class DelegatedClearAllPinsResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
 
-    CommandParameter launchApp_data_commandParameter = new CommandParameter("data", String.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_data_commandParameter);
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
 
-    CommandParameter launchApp_catalogVendorId_commandParameter =
-        new CommandParameter("catalogVendorId", int.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_catalogVendorId_commandParameter);
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
 
-    CommandParameter launchApp_applicationId_commandParameter =
-        new CommandParameter("applicationId", String.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_applicationId_commandParameter);
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
 
-    // Populate commands
-    CommandInfo applicationLauncher_launchApp_CommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              // TODO: expose index in template helper
+  public class DelegatedClearAllRfidsResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedClearHolidayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedClearPinResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearPinResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedClearRfidResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearRfidResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedClearWeekdayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedClearYeardayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetHolidayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        int scheduleId,
+        int status,
+        long localStartTime,
+        long localEndTime,
+        int operatingModeDuringHoliday) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(scheduleId);
+      responseValues.add(status);
+      responseValues.add(localStartTime);
+      responseValues.add(localEndTime);
+      responseValues.add(operatingModeDuringHoliday);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetLogRecordResponseCallback
+      implements ChipClusters.DoorLockCluster.GetLogRecordResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        int logEntryId,
+        long timestamp,
+        int eventType,
+        int source,
+        int eventIdOrAlarmCode,
+        int userId,
+        byte[] pin) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(logEntryId);
+      responseValues.add(timestamp);
+      responseValues.add(eventType);
+      responseValues.add(source);
+      responseValues.add(eventIdOrAlarmCode);
+      responseValues.add(userId);
+      responseValues.add(pin);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetPinResponseCallback
+      implements ChipClusters.DoorLockCluster.GetPinResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int userId, int userStatus, int userType, byte[] pin) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(userId);
+      responseValues.add(userStatus);
+      responseValues.add(userType);
+      responseValues.add(pin);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetRfidResponseCallback
+      implements ChipClusters.DoorLockCluster.GetRfidResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int userId, int userStatus, int userType, byte[] rfid) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(userId);
+      responseValues.add(userStatus);
+      responseValues.add(userType);
+      responseValues.add(rfid);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetUserTypeResponseCallback
+      implements ChipClusters.DoorLockCluster.GetUserTypeResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int userId, int userType) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(userId);
+      responseValues.add(userType);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetWeekdayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        int scheduleId,
+        int userId,
+        int status,
+        int daysMask,
+        int startHour,
+        int startMinute,
+        int endHour,
+        int endMinute) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(scheduleId);
+      responseValues.add(userId);
+      responseValues.add(status);
+      responseValues.add(daysMask);
+      responseValues.add(startHour);
+      responseValues.add(startMinute);
+      responseValues.add(endHour);
+      responseValues.add(endMinute);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetYeardayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        int scheduleId, int userId, int status, long localStartTime, long localEndTime) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(scheduleId);
+      responseValues.add(userId);
+      responseValues.add(status);
+      responseValues.add(localStartTime);
+      responseValues.add(localEndTime);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedLockDoorResponseCallback
+      implements ChipClusters.DoorLockCluster.LockDoorResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetHolidayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetPinResponseCallback
+      implements ChipClusters.DoorLockCluster.SetPinResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetRfidResponseCallback
+      implements ChipClusters.DoorLockCluster.SetRfidResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetUserTypeResponseCallback
+      implements ChipClusters.DoorLockCluster.SetUserTypeResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetWeekdayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetYeardayScheduleResponseCallback
+      implements ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedUnlockDoorResponseCallback
+      implements ChipClusters.DoorLockCluster.UnlockDoorResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedUnlockWithTimeoutResponseCallback
+      implements ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedArmFailSafeResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedCommissioningCompleteResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSetRegulatoryConfigResponseCallback
+      implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedAddGroupResponseCallback
+      implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetGroupMembershipResponseCallback
+      implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int capacity, int groupCount
+        // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        ) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(capacity);
+      responseValues.add(groupCount);
+      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedRemoveGroupResponseCallback
+      implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedViewGroupResponseCallback
+      implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId, String groupName) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      responseValues.add(groupName);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedIdentifyQueryResponseCallback
+      implements ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int timeout) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(timeout);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedSendKeyResponseCallback
+      implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaFastForwardResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaNextResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaPauseResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaPlayResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaPreviousResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaRewindResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaSeekResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaSkipBackwardResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaSkipForwardResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaStartOverResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedMediaStopResponseCallback
+      implements ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int mediaPlaybackStatus) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(mediaPlaybackStatus);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedAddThreadNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedAddWiFiNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedDisableNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedEnableNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedRemoveNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedScanNetworksResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText
+        // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        ) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedUpdateThreadNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedUpdateWiFiNetworkResponseCallback
+      implements ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int errorCode, String debugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(errorCode);
+      responseValues.add(debugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedApplyUpdateRequestResponseCallback
+      implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int action, long delayedActionTime) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(action);
+      responseValues.add(delayedActionTime);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedQueryImageResponseCallback
+      implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        int status,
+        long delayedActionTime,
+        String imageURI,
+        long softwareVersion,
+        String softwareVersionString,
+        byte[] updateToken,
+        boolean userConsentNeeded,
+        byte[] metadataForRequestor) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(delayedActionTime);
+      responseValues.add(imageURI);
+      responseValues.add(softwareVersion);
+      responseValues.add(softwareVersionString);
+      responseValues.add(updateToken);
+      responseValues.add(userConsentNeeded);
+      responseValues.add(metadataForRequestor);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedAttestationResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] AttestationElements, byte[] Signature) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(AttestationElements);
+      responseValues.add(Signature);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedCertificateChainResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] Certificate) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(Certificate);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedNOCResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int StatusCode, int FabricIndex, byte[] DebugText) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(StatusCode);
+      responseValues.add(FabricIndex);
+      responseValues.add(DebugText);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedOpCSRResponseCallback
+      implements ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(NOCSRElements);
+      responseValues.add(AttestationSignature);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedAddSceneResponseCallback
+      implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId, int sceneId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      responseValues.add(sceneId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedGetSceneMembershipResponseCallback
+      implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int capacity, int groupId, int sceneCount
+        // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        ) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(capacity);
+      responseValues.add(groupId);
+      responseValues.add(sceneCount);
+      // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedRemoveAllScenesResponseCallback
+      implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedRemoveSceneResponseCallback
+      implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId, int sceneId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      responseValues.add(sceneId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedStoreSceneResponseCallback
+      implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId, int sceneId) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      responseValues.add(sceneId);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedViewSceneResponseCallback
+      implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, int groupId, int sceneId, int transitionTime, String sceneName
+        // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        ) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(groupId);
+      responseValues.add(sceneId);
+      responseValues.add(transitionTime);
+      responseValues.add(sceneName);
+      // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedChangeChannelResponseCallback
+      implements ChipClusters.TvChannelCluster.ChangeChannelResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        int ErrorType) {
+      List<Object> responseValues = new ArrayList<>();
+      // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      responseValues.add(ErrorType);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedNavigateTargetResponseCallback
+      implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int status, String data) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(status);
+      responseValues.add(data);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedTestAddArgumentsResponseCallback
+      implements ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int returnValue) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public class DelegatedTestSpecificResponseCallback
+      implements ChipClusters.TestClusterCluster.TestSpecificResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(int returnValue) {
+      List<Object> responseValues = new ArrayList<>();
+      responseValues.add(returnValue);
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
+  public Map<String, ClusterInfo> getClusterMap() {
+    Map<String, ClusterInfo> clusterMap = new HashMap<>();
+    Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
+    Map<String, CommandParameter> accountLogin_getSetupPIN_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter accountLogin_getSetupPIN_commandParameter =
+        new CommandParameter(
+            "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
+    CommandParameter accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    accountLogin_getSetupPIN_commandParams.put(
+        "tempAccountIdentifier", accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo accountLogin_getSetupPIN_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .getSetupPIN(
+                      (ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback,
+                      (String) commandArguments.get("tempAccountIdentifier"));
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLogin_getSetupPIN_commandParams);
+    accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
+<<<<<<< HEAD
+    List<CommandParameter> accountLogin_login_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter login_tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    accountLogin_login_commandParams.add(login_tempAccountIdentifier_commandParameter);
+
+    CommandParameter login_setupPIN_commandParameter =
+        new CommandParameter("setupPIN", String.class);
+    accountLogin_login_commandParams.add(login_setupPIN_commandParameter);
+=======
+    Map<String, CommandParameter> accountLogin_login_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter accountLogin_login_commandParameter =
+        new CommandParameter("AccountLogin", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter accountLogin_login_tempAccountIdentifier_commandParameter =
+        new CommandParameter("tempAccountIdentifier", String.class);
+    accountLogin_login_commandParams.put(
+        "tempAccountIdentifier", accountLogin_login_tempAccountIdentifier_commandParameter);
+
+    CommandParameter accountLogin_login_setupPIN_commandParameter =
+        new CommandParameter("setupPIN", String.class);
+    accountLogin_login_commandParams.put("setupPIN", accountLogin_login_setupPIN_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo accountLogin_login_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.AccountLoginCluster) cluster)
+                  .login(
+                      (DefaultClusterCallback) callback,
+                      (String) commandArguments.get("tempAccountIdentifier"),
+                      (String) commandArguments.get("setupPIN"));
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            accountLogin_login_commandParams);
+    accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
+    // Populate cluster
+    ClusterInfo accountLogin_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
+            accountLogin_ClusterCommandInfo);
+    clusterMap.put("accountLogin", accountLogin_clusterInfo);
+    Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
+    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams =
+        new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter openBasicCommissioningWindow_commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openBasicCommissioningWindow_commandParams.add(
+        openBasicCommissioningWindow_commissioningTimeout_commandParameter);
+=======
+    Map<String, CommandParameter>
+        administratorCommissioning_openBasicCommissioningWindow_commandParams =
+            new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter administratorCommissioning_openBasicCommissioningWindow_commandParameter =
+        new CommandParameter(
+            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter =
+            new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openBasicCommissioningWindow_commandParams.put(
+        "commissioningTimeout",
+        administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .openBasicCommissioningWindow(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("commissioningTimeout"));
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_openBasicCommissioningWindow_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "openBasicCommissioningWindow",
+        administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
+<<<<<<< HEAD
+    List<CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
+        new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter openCommissioningWindow_commissioningTimeout_commandParameter =
+        new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_commissioningTimeout_commandParameter);
+
+    CommandParameter openCommissioningWindow_PAKEVerifier_commandParameter =
+        new CommandParameter("PAKEVerifier", byte[].class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_PAKEVerifier_commandParameter);
+
+    CommandParameter openCommissioningWindow_discriminator_commandParameter =
+        new CommandParameter("discriminator", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_discriminator_commandParameter);
+
+    CommandParameter openCommissioningWindow_iterations_commandParameter =
+        new CommandParameter("iterations", long.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_iterations_commandParameter);
+
+    CommandParameter openCommissioningWindow_salt_commandParameter =
+        new CommandParameter("salt", byte[].class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_salt_commandParameter);
+
+    CommandParameter openCommissioningWindow_passcodeID_commandParameter =
+        new CommandParameter("passcodeID", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.add(
+        openCommissioningWindow_passcodeID_commandParameter);
+=======
+    Map<String, CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter administratorCommissioning_openCommissioningWindow_commandParameter =
+        new CommandParameter(
+            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter =
+            new CommandParameter("commissioningTimeout", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "commissioningTimeout",
+        administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter);
+
+    CommandParameter
+        administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter =
+            new CommandParameter("PAKEVerifier", byte[].class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "PAKEVerifier",
+        administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter);
+
+    CommandParameter
+        administratorCommissioning_openCommissioningWindow_discriminator_commandParameter =
+            new CommandParameter("discriminator", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "discriminator",
+        administratorCommissioning_openCommissioningWindow_discriminator_commandParameter);
+
+    CommandParameter
+        administratorCommissioning_openCommissioningWindow_iterations_commandParameter =
+            new CommandParameter("iterations", long.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "iterations",
+        administratorCommissioning_openCommissioningWindow_iterations_commandParameter);
+
+    CommandParameter administratorCommissioning_openCommissioningWindow_salt_commandParameter =
+        new CommandParameter("salt", byte[].class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "salt", administratorCommissioning_openCommissioningWindow_salt_commandParameter);
+
+    CommandParameter
+        administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter =
+            new CommandParameter("passcodeID", int.class);
+    administratorCommissioning_openCommissioningWindow_commandParams.put(
+        "passcodeID",
+        administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .openCommissioningWindow(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("commissioningTimeout"),
+                      (byte[]) commandArguments.get("PAKEVerifier"),
+                      (Integer) commandArguments.get("discriminator"),
+                      (Long) commandArguments.get("iterations"),
+                      (byte[]) commandArguments.get("salt"),
+                      (Integer) commandArguments.get("passcodeID"));
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_openCommissioningWindow_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
+<<<<<<< HEAD
+    List<CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
+        new ArrayList<>();
+    // TODO: fill out parameter types
+
+=======
+    Map<String, CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter administratorCommissioning_revokeCommissioning_commandParameter =
+        new CommandParameter(
+            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
+    // Populate commands
+    CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.AdministratorCommissioningCluster) cluster)
+                  .revokeCommissioning((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            administratorCommissioning_revokeCommissioning_commandParams);
+    administratorCommissioning_ClusterCommandInfo.put(
+        "revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
+    // Populate cluster
+    ClusterInfo administratorCommissioning_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) ->
+                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
+            administratorCommissioning_ClusterCommandInfo);
+    clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
+    Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
+    List<CommandParameter> applicationBasic_changeStatus_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter changeStatus_status_commandParameter =
+        new CommandParameter("status", int.class);
+    applicationBasic_changeStatus_commandParams.add(changeStatus_status_commandParameter);
+=======
+    Map<String, CommandParameter> applicationBasic_changeStatus_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter applicationBasic_changeStatus_commandParameter =
+        new CommandParameter("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter applicationBasic_changeStatus_status_commandParameter =
+        new CommandParameter("status", int.class);
+    applicationBasic_changeStatus_commandParams.put(
+        "status", applicationBasic_changeStatus_status_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo applicationBasic_changeStatus_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.ApplicationBasicCluster) cluster)
+                  .changeStatus(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("status"));
+>>>>>>> 677ef48a5 (callback generation done)
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            applicationBasic_changeStatus_commandParams);
+    applicationBasic_ClusterCommandInfo.put(
+        "changeStatus", applicationBasic_changeStatus_CommandInfo);
+    // Populate cluster
+    ClusterInfo applicationBasic_clusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
+            applicationBasic_ClusterCommandInfo);
+    clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
+    Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
+    List<CommandParameter> applicationLauncher_launchApp_commandParams = new ArrayList<>();
+    // TODO: fill out parameter types
+
+    CommandParameter launchApp_data_commandParameter = new CommandParameter("data", String.class);
+    applicationLauncher_launchApp_commandParams.add(launchApp_data_commandParameter);
+
+    CommandParameter launchApp_catalogVendorId_commandParameter =
+        new CommandParameter("catalogVendorId", int.class);
+    applicationLauncher_launchApp_commandParams.add(launchApp_catalogVendorId_commandParameter);
+
+    CommandParameter launchApp_applicationId_commandParameter =
+        new CommandParameter("applicationId", String.class);
+    applicationLauncher_launchApp_commandParams.add(launchApp_applicationId_commandParameter);
+=======
+    Map<String, CommandParameter> applicationLauncher_launchApp_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter applicationLauncher_launchApp_commandParameter =
+        new CommandParameter(
+            "ApplicationLauncher",
+            ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
+    CommandParameter applicationLauncher_launchApp_data_commandParameter =
+        new CommandParameter("data", String.class);
+    applicationLauncher_launchApp_commandParams.put(
+        "data", applicationLauncher_launchApp_data_commandParameter);
+
+    CommandParameter applicationLauncher_launchApp_catalogVendorId_commandParameter =
+        new CommandParameter("catalogVendorId", int.class);
+    applicationLauncher_launchApp_commandParams.put(
+        "catalogVendorId", applicationLauncher_launchApp_catalogVendorId_commandParameter);
+
+    CommandParameter applicationLauncher_launchApp_applicationId_commandParameter =
+        new CommandParameter("applicationId", String.class);
+    applicationLauncher_launchApp_commandParams.put(
+        "applicationId", applicationLauncher_launchApp_applicationId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
+
+    // Populate commands
+    CommandInfo applicationLauncher_launchApp_CommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
+              // TODO: expose index in template helper
+=======
+              ((ChipClusters.ApplicationLauncherCluster) cluster)
+                  .launchApp(
+                      (ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback) callback,
+                      (String) commandArguments.get("data"),
+                      (Integer) commandArguments.get("catalogVendorId"),
+                      (String) commandArguments.get("applicationId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             applicationLauncher_launchApp_commandParams);
@@ -7719,6 +9667,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             applicationLauncher_ClusterCommandInfo);
     clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
     Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> audioOutput_renameOutput_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7728,27 +9677,69 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter renameOutput_name_commandParameter =
         new CommandParameter("name", String.class);
     audioOutput_renameOutput_commandParams.add(renameOutput_name_commandParameter);
+=======
+    Map<String, CommandParameter> audioOutput_renameOutput_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter audioOutput_renameOutput_commandParameter =
+        new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter audioOutput_renameOutput_index_commandParameter =
+        new CommandParameter("index", int.class);
+    audioOutput_renameOutput_commandParams.put(
+        "index", audioOutput_renameOutput_index_commandParameter);
+
+    CommandParameter audioOutput_renameOutput_name_commandParameter =
+        new CommandParameter("name", String.class);
+    audioOutput_renameOutput_commandParams.put(
+        "name", audioOutput_renameOutput_name_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo audioOutput_renameOutput_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .renameOutput(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("index"),
+                      (String) commandArguments.get("name"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             audioOutput_renameOutput_commandParams);
     audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> audioOutput_selectOutput_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter selectOutput_index_commandParameter = new CommandParameter("index", int.class);
     audioOutput_selectOutput_commandParams.add(selectOutput_index_commandParameter);
+=======
+    Map<String, CommandParameter> audioOutput_selectOutput_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter audioOutput_selectOutput_commandParameter =
+        new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter audioOutput_selectOutput_index_commandParameter =
+        new CommandParameter("index", int.class);
+    audioOutput_selectOutput_commandParams.put(
+        "index", audioOutput_selectOutput_index_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo audioOutput_selectOutput_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.AudioOutputCluster) cluster)
+                  .selectOutput(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             audioOutput_selectOutput_commandParams);
@@ -7760,6 +9751,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             audioOutput_ClusterCommandInfo);
     clusterMap.put("audioOutput", audioOutput_clusterInfo);
     Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -7768,25 +9760,56 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("percentOpen", int.class);
     barrierControl_barrierControlGoToPercent_commandParams.add(
         barrierControlGoToPercent_percentOpen_commandParameter);
+=======
+    Map<String, CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter barrierControl_barrierControlGoToPercent_commandParameter =
+        new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter barrierControl_barrierControlGoToPercent_percentOpen_commandParameter =
+        new CommandParameter("percentOpen", int.class);
+    barrierControl_barrierControlGoToPercent_commandParams.put(
+        "percentOpen", barrierControl_barrierControlGoToPercent_percentOpen_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo barrierControl_barrierControlGoToPercent_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .barrierControlGoToPercent(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("percentOpen"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             barrierControl_barrierControlGoToPercent_commandParams);
     barrierControl_ClusterCommandInfo.put(
         "barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> barrierControl_barrierControlStop_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> barrierControl_barrierControlStop_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter barrierControl_barrierControlStop_commandParameter =
+        new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo barrierControl_barrierControlStop_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.BarrierControlCluster) cluster)
+                  .barrierControlStop((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             barrierControl_barrierControlStop_commandParams);
@@ -7799,14 +9822,27 @@ public Map<String, ClusterInfo> getClusterMap() {
             barrierControl_ClusterCommandInfo);
     clusterMap.put("barrierControl", barrierControl_clusterInfo);
     Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> basic_mfgSpecificPing_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> basic_mfgSpecificPing_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter basic_mfgSpecificPing_commandParameter =
+        new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo basic_mfgSpecificPing_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.BasicCluster) cluster)
+                  .mfgSpecificPing((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             basic_mfgSpecificPing_commandParams);
@@ -7825,6 +9861,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             binaryInputBasic_ClusterCommandInfo);
     clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
     Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> binding_bind_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7841,16 +9878,49 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter bind_clusterId_commandParameter =
         new CommandParameter("clusterId", long.class);
     binding_bind_commandParams.add(bind_clusterId_commandParameter);
+=======
+    Map<String, CommandParameter> binding_bind_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter binding_bind_commandParameter =
+        new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter binding_bind_nodeId_commandParameter =
+        new CommandParameter("nodeId", long.class);
+    binding_bind_commandParams.put("nodeId", binding_bind_nodeId_commandParameter);
+
+    CommandParameter binding_bind_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    binding_bind_commandParams.put("groupId", binding_bind_groupId_commandParameter);
+
+    CommandParameter binding_bind_endpointId_commandParameter =
+        new CommandParameter("endpointId", int.class);
+    binding_bind_commandParams.put("endpointId", binding_bind_endpointId_commandParameter);
+
+    CommandParameter binding_bind_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    binding_bind_commandParams.put("clusterId", binding_bind_clusterId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo binding_bind_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.BindingCluster) cluster)
+                  .bind(
+                      (DefaultClusterCallback) callback,
+                      (Long) commandArguments.get("nodeId"),
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("endpointId"),
+                      (Long) commandArguments.get("clusterId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             binding_bind_commandParams);
     binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> binding_unbind_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7867,12 +9937,44 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter unbind_clusterId_commandParameter =
         new CommandParameter("clusterId", long.class);
     binding_unbind_commandParams.add(unbind_clusterId_commandParameter);
+=======
+    Map<String, CommandParameter> binding_unbind_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter binding_unbind_commandParameter =
+        new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter binding_unbind_nodeId_commandParameter =
+        new CommandParameter("nodeId", long.class);
+    binding_unbind_commandParams.put("nodeId", binding_unbind_nodeId_commandParameter);
+
+    CommandParameter binding_unbind_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    binding_unbind_commandParams.put("groupId", binding_unbind_groupId_commandParameter);
+
+    CommandParameter binding_unbind_endpointId_commandParameter =
+        new CommandParameter("endpointId", int.class);
+    binding_unbind_commandParams.put("endpointId", binding_unbind_endpointId_commandParameter);
+
+    CommandParameter binding_unbind_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    binding_unbind_commandParams.put("clusterId", binding_unbind_clusterId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo binding_unbind_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.BindingCluster) cluster)
+                  .unbind(
+                      (DefaultClusterCallback) callback,
+                      (Long) commandArguments.get("nodeId"),
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("endpointId"),
+                      (Long) commandArguments.get("clusterId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             binding_unbind_commandParams);
@@ -7891,6 +9993,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             bridgedDeviceBasic_ClusterCommandInfo);
     clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
     Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> colorControl_colorLoopSet_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7920,16 +10023,71 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter colorLoopSet_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_colorLoopSet_commandParams.add(colorLoopSet_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_colorLoopSet_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_colorLoopSet_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_colorLoopSet_updateFlags_commandParameter =
+        new CommandParameter("updateFlags", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "updateFlags", colorControl_colorLoopSet_updateFlags_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_action_commandParameter =
+        new CommandParameter("action", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "action", colorControl_colorLoopSet_action_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "direction", colorControl_colorLoopSet_direction_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_time_commandParameter =
+        new CommandParameter("time", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "time", colorControl_colorLoopSet_time_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_startHue_commandParameter =
+        new CommandParameter("startHue", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "startHue", colorControl_colorLoopSet_startHue_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "optionsMask", colorControl_colorLoopSet_optionsMask_commandParameter);
+
+    CommandParameter colorControl_colorLoopSet_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_colorLoopSet_commandParams.put(
+        "optionsOverride", colorControl_colorLoopSet_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_colorLoopSet_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .colorLoopSet(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("updateFlags"),
+                      (Integer) commandArguments.get("action"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("time"),
+                      (Integer) commandArguments.get("startHue"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_colorLoopSet_commandParams);
     colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_enhancedMoveHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7949,17 +10107,54 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_enhancedMoveHue_commandParams.add(
         enhancedMoveHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_enhancedMoveHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_enhancedMoveHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_enhancedMoveHue_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_enhancedMoveHue_commandParams.put(
+        "moveMode", colorControl_enhancedMoveHue_moveMode_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveHue_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_enhancedMoveHue_commandParams.put(
+        "rate", colorControl_enhancedMoveHue_rate_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveHue_commandParams.put(
+        "optionsMask", colorControl_enhancedMoveHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveHue_commandParams.put(
+        "optionsOverride", colorControl_enhancedMoveHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_enhancedMoveHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_enhancedMoveHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_enhancedMoveToHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -7986,17 +10181,60 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_enhancedMoveToHue_commandParams.add(
         enhancedMoveToHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_enhancedMoveToHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_enhancedMoveToHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_enhancedMoveToHue_enhancedHue_commandParameter =
+        new CommandParameter("enhancedHue", int.class);
+    colorControl_enhancedMoveToHue_commandParams.put(
+        "enhancedHue", colorControl_enhancedMoveToHue_enhancedHue_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHue_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_enhancedMoveToHue_commandParams.put(
+        "direction", colorControl_enhancedMoveToHue_direction_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedMoveToHue_commandParams.put(
+        "transitionTime", colorControl_enhancedMoveToHue_transitionTime_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveToHue_commandParams.put(
+        "optionsMask", colorControl_enhancedMoveToHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveToHue_commandParams.put(
+        "optionsOverride", colorControl_enhancedMoveToHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_enhancedMoveToHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveToHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("enhancedHue"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_enhancedMoveToHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -8025,17 +10263,62 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
         enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter =
+        new CommandParameter("enhancedHue", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+        "enhancedHue", colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+        "saturation", colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+        "transitionTime",
+        colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+        "optionsMask", colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
+
+    CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+        "optionsOverride",
+        colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_enhancedMoveToHueAndSaturation_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedMoveToHueAndSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("enhancedHue"),
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_enhancedMoveToHueAndSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_enhancedStepHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8059,17 +10342,60 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_enhancedStepHue_commandParams.add(
         enhancedStepHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_enhancedStepHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_enhancedStepHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_enhancedStepHue_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_enhancedStepHue_commandParams.put(
+        "stepMode", colorControl_enhancedStepHue_stepMode_commandParameter);
+
+    CommandParameter colorControl_enhancedStepHue_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_enhancedStepHue_commandParams.put(
+        "stepSize", colorControl_enhancedStepHue_stepSize_commandParameter);
+
+    CommandParameter colorControl_enhancedStepHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_enhancedStepHue_commandParams.put(
+        "transitionTime", colorControl_enhancedStepHue_transitionTime_commandParameter);
+
+    CommandParameter colorControl_enhancedStepHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_enhancedStepHue_commandParams.put(
+        "optionsMask", colorControl_enhancedStepHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_enhancedStepHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_enhancedStepHue_commandParams.put(
+        "optionsOverride", colorControl_enhancedStepHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_enhancedStepHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .enhancedStepHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_enhancedStepHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveColor_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8086,16 +10412,53 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveColor_commandParams.add(moveColor_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveColor_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveColor_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveColor_rateX_commandParameter =
+        new CommandParameter("rateX", int.class);
+    colorControl_moveColor_commandParams.put(
+        "rateX", colorControl_moveColor_rateX_commandParameter);
+
+    CommandParameter colorControl_moveColor_rateY_commandParameter =
+        new CommandParameter("rateY", int.class);
+    colorControl_moveColor_commandParams.put(
+        "rateY", colorControl_moveColor_rateY_commandParameter);
+
+    CommandParameter colorControl_moveColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveColor_commandParams.put(
+        "optionsMask", colorControl_moveColor_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveColor_commandParams.put(
+        "optionsOverride", colorControl_moveColor_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveColor_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("rateX"),
+                      (Integer) commandArguments.get("rateY"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveColor_commandParams);
     colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveColorTemperature_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8127,17 +10490,68 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveColorTemperature_commandParams.add(
         moveColorTemperature_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveColorTemperature_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveColorTemperature_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveColorTemperature_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "moveMode", colorControl_moveColorTemperature_moveMode_commandParameter);
+
+    CommandParameter colorControl_moveColorTemperature_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "rate", colorControl_moveColorTemperature_rate_commandParameter);
+
+    CommandParameter colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "colorTemperatureMinimum",
+        colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter);
+
+    CommandParameter colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "colorTemperatureMaximum",
+        colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter);
+
+    CommandParameter colorControl_moveColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "optionsMask", colorControl_moveColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveColorTemperature_commandParams.put(
+        "optionsOverride", colorControl_moveColorTemperature_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveColorTemperature_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveColorTemperature(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("colorTemperatureMinimum"),
+                      (Integer) commandArguments.get("colorTemperatureMaximum"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8155,16 +10569,52 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveHue_commandParams.add(moveHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveHue_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveHue_commandParams.put(
+        "moveMode", colorControl_moveHue_moveMode_commandParameter);
+
+    CommandParameter colorControl_moveHue_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_moveHue_commandParams.put("rate", colorControl_moveHue_rate_commandParameter);
+
+    CommandParameter colorControl_moveHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveHue_commandParams.put(
+        "optionsMask", colorControl_moveHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveHue_commandParams.put(
+        "optionsOverride", colorControl_moveHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveHue_commandParams);
     colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveSaturation_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8182,16 +10632,53 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveSaturation_commandParams.add(moveSaturation_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveSaturation_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveSaturation_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveSaturation_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    colorControl_moveSaturation_commandParams.put(
+        "moveMode", colorControl_moveSaturation_moveMode_commandParameter);
+
+    CommandParameter colorControl_moveSaturation_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    colorControl_moveSaturation_commandParams.put(
+        "rate", colorControl_moveSaturation_rate_commandParameter);
+
+    CommandParameter colorControl_moveSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveSaturation_commandParams.put(
+        "optionsMask", colorControl_moveSaturation_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveSaturation_commandParams.put(
+        "optionsOverride", colorControl_moveSaturation_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveSaturation_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveSaturation_commandParams);
     colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveToColor_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8214,16 +10701,59 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveToColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveToColor_commandParams.add(moveToColor_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveToColor_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveToColor_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveToColor_colorX_commandParameter =
+        new CommandParameter("colorX", int.class);
+    colorControl_moveToColor_commandParams.put(
+        "colorX", colorControl_moveToColor_colorX_commandParameter);
+
+    CommandParameter colorControl_moveToColor_colorY_commandParameter =
+        new CommandParameter("colorY", int.class);
+    colorControl_moveToColor_commandParams.put(
+        "colorY", colorControl_moveToColor_colorY_commandParameter);
+
+    CommandParameter colorControl_moveToColor_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToColor_commandParams.put(
+        "transitionTime", colorControl_moveToColor_transitionTime_commandParameter);
+
+    CommandParameter colorControl_moveToColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToColor_commandParams.put(
+        "optionsMask", colorControl_moveToColor_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveToColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToColor_commandParams.put(
+        "optionsOverride", colorControl_moveToColor_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveToColor_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("colorX"),
+                      (Integer) commandArguments.get("colorY"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveToColor_commandParams);
     colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveToColorTemperature_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8246,17 +10776,54 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveToColorTemperature_commandParams.add(
         moveToColorTemperature_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveToColorTemperature_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveToColorTemperature_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveToColorTemperature_colorTemperature_commandParameter =
+        new CommandParameter("colorTemperature", int.class);
+    colorControl_moveToColorTemperature_commandParams.put(
+        "colorTemperature", colorControl_moveToColorTemperature_colorTemperature_commandParameter);
+
+    CommandParameter colorControl_moveToColorTemperature_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToColorTemperature_commandParams.put(
+        "transitionTime", colorControl_moveToColorTemperature_transitionTime_commandParameter);
+
+    CommandParameter colorControl_moveToColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToColorTemperature_commandParams.put(
+        "optionsMask", colorControl_moveToColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveToColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToColorTemperature_commandParams.put(
+        "optionsOverride", colorControl_moveToColorTemperature_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveToColorTemperature_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToColorTemperature(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("colorTemperature"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveToColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveToHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8278,16 +10845,58 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveToHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveToHue_commandParams.add(moveToHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveToHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveToHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveToHue_hue_commandParameter =
+        new CommandParameter("hue", int.class);
+    colorControl_moveToHue_commandParams.put("hue", colorControl_moveToHue_hue_commandParameter);
+
+    CommandParameter colorControl_moveToHue_direction_commandParameter =
+        new CommandParameter("direction", int.class);
+    colorControl_moveToHue_commandParams.put(
+        "direction", colorControl_moveToHue_direction_commandParameter);
+
+    CommandParameter colorControl_moveToHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToHue_commandParams.put(
+        "transitionTime", colorControl_moveToHue_transitionTime_commandParameter);
+
+    CommandParameter colorControl_moveToHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToHue_commandParams.put(
+        "optionsMask", colorControl_moveToHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveToHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToHue_commandParams.put(
+        "optionsOverride", colorControl_moveToHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveToHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("hue"),
+                      (Integer) commandArguments.get("direction"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveToHue_commandParams);
     colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveToHueAndSaturation_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8315,17 +10924,60 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveToHueAndSaturation_commandParams.add(
         moveToHueAndSaturation_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveToHueAndSaturation_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveToHueAndSaturation_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveToHueAndSaturation_hue_commandParameter =
+        new CommandParameter("hue", int.class);
+    colorControl_moveToHueAndSaturation_commandParams.put(
+        "hue", colorControl_moveToHueAndSaturation_hue_commandParameter);
+
+    CommandParameter colorControl_moveToHueAndSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_moveToHueAndSaturation_commandParams.put(
+        "saturation", colorControl_moveToHueAndSaturation_saturation_commandParameter);
+
+    CommandParameter colorControl_moveToHueAndSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToHueAndSaturation_commandParams.put(
+        "transitionTime", colorControl_moveToHueAndSaturation_transitionTime_commandParameter);
+
+    CommandParameter colorControl_moveToHueAndSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToHueAndSaturation_commandParams.put(
+        "optionsMask", colorControl_moveToHueAndSaturation_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveToHueAndSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToHueAndSaturation_commandParams.put(
+        "optionsOverride", colorControl_moveToHueAndSaturation_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveToHueAndSaturation_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToHueAndSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("hue"),
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveToHueAndSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_moveToSaturation_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8346,17 +10998,54 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_moveToSaturation_commandParams.add(
         moveToSaturation_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_moveToSaturation_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_moveToSaturation_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_moveToSaturation_saturation_commandParameter =
+        new CommandParameter("saturation", int.class);
+    colorControl_moveToSaturation_commandParams.put(
+        "saturation", colorControl_moveToSaturation_saturation_commandParameter);
+
+    CommandParameter colorControl_moveToSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_moveToSaturation_commandParams.put(
+        "transitionTime", colorControl_moveToSaturation_transitionTime_commandParameter);
+
+    CommandParameter colorControl_moveToSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_moveToSaturation_commandParams.put(
+        "optionsMask", colorControl_moveToSaturation_optionsMask_commandParameter);
+
+    CommandParameter colorControl_moveToSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_moveToSaturation_commandParams.put(
+        "optionsOverride", colorControl_moveToSaturation_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_moveToSaturation_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .moveToSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("saturation"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_moveToSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToSaturation", colorControl_moveToSaturation_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_stepColor_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8377,16 +11066,59 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stepColor_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_stepColor_commandParams.add(stepColor_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_stepColor_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_stepColor_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_stepColor_stepX_commandParameter =
+        new CommandParameter("stepX", int.class);
+    colorControl_stepColor_commandParams.put(
+        "stepX", colorControl_stepColor_stepX_commandParameter);
+
+    CommandParameter colorControl_stepColor_stepY_commandParameter =
+        new CommandParameter("stepY", int.class);
+    colorControl_stepColor_commandParams.put(
+        "stepY", colorControl_stepColor_stepY_commandParameter);
+
+    CommandParameter colorControl_stepColor_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepColor_commandParams.put(
+        "transitionTime", colorControl_stepColor_transitionTime_commandParameter);
+
+    CommandParameter colorControl_stepColor_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepColor_commandParams.put(
+        "optionsMask", colorControl_stepColor_optionsMask_commandParameter);
+
+    CommandParameter colorControl_stepColor_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepColor_commandParams.put(
+        "optionsOverride", colorControl_stepColor_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_stepColor_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepColor(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepX"),
+                      (Integer) commandArguments.get("stepY"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_stepColor_commandParams);
     colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_stepColorTemperature_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8424,17 +11156,74 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("optionsOverride", int.class);
     colorControl_stepColorTemperature_commandParams.add(
         stepColorTemperature_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_stepColorTemperature_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_stepColorTemperature_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_stepColorTemperature_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "stepMode", colorControl_stepColorTemperature_stepMode_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "stepSize", colorControl_stepColorTemperature_stepSize_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "transitionTime", colorControl_stepColorTemperature_transitionTime_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter =
+        new CommandParameter("colorTemperatureMinimum", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "colorTemperatureMinimum",
+        colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter =
+        new CommandParameter("colorTemperatureMaximum", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "colorTemperatureMaximum",
+        colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "optionsMask", colorControl_stepColorTemperature_optionsMask_commandParameter);
+
+    CommandParameter colorControl_stepColorTemperature_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepColorTemperature_commandParams.put(
+        "optionsOverride", colorControl_stepColorTemperature_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_stepColorTemperature_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepColorTemperature(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("colorTemperatureMinimum"),
+                      (Integer) commandArguments.get("colorTemperatureMaximum"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_stepColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_stepHue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8457,16 +11246,59 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stepHue_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_stepHue_commandParams.add(stepHue_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_stepHue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_stepHue_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_stepHue_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepHue_commandParams.put(
+        "stepMode", colorControl_stepHue_stepMode_commandParameter);
+
+    CommandParameter colorControl_stepHue_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepHue_commandParams.put(
+        "stepSize", colorControl_stepHue_stepSize_commandParameter);
+
+    CommandParameter colorControl_stepHue_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepHue_commandParams.put(
+        "transitionTime", colorControl_stepHue_transitionTime_commandParameter);
+
+    CommandParameter colorControl_stepHue_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepHue_commandParams.put(
+        "optionsMask", colorControl_stepHue_optionsMask_commandParameter);
+
+    CommandParameter colorControl_stepHue_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepHue_commandParams.put(
+        "optionsOverride", colorControl_stepHue_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_stepHue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepHue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_stepHue_commandParams);
     colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_stepSaturation_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8489,16 +11321,59 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stepSaturation_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_stepSaturation_commandParams.add(stepSaturation_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_stepSaturation_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_stepSaturation_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_stepSaturation_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    colorControl_stepSaturation_commandParams.put(
+        "stepMode", colorControl_stepSaturation_stepMode_commandParameter);
+
+    CommandParameter colorControl_stepSaturation_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    colorControl_stepSaturation_commandParams.put(
+        "stepSize", colorControl_stepSaturation_stepSize_commandParameter);
+
+    CommandParameter colorControl_stepSaturation_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    colorControl_stepSaturation_commandParams.put(
+        "transitionTime", colorControl_stepSaturation_transitionTime_commandParameter);
+
+    CommandParameter colorControl_stepSaturation_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stepSaturation_commandParams.put(
+        "optionsMask", colorControl_stepSaturation_optionsMask_commandParameter);
+
+    CommandParameter colorControl_stepSaturation_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stepSaturation_commandParams.put(
+        "optionsOverride", colorControl_stepSaturation_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_stepSaturation_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stepSaturation(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_stepSaturation_commandParams);
     colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> colorControl_stopMoveStep_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8509,12 +11384,36 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stopMoveStep_optionsOverride_commandParameter =
         new CommandParameter("optionsOverride", int.class);
     colorControl_stopMoveStep_commandParams.add(stopMoveStep_optionsOverride_commandParameter);
+=======
+    Map<String, CommandParameter> colorControl_stopMoveStep_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter colorControl_stopMoveStep_commandParameter =
+        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter colorControl_stopMoveStep_optionsMask_commandParameter =
+        new CommandParameter("optionsMask", int.class);
+    colorControl_stopMoveStep_commandParams.put(
+        "optionsMask", colorControl_stopMoveStep_optionsMask_commandParameter);
+
+    CommandParameter colorControl_stopMoveStep_optionsOverride_commandParameter =
+        new CommandParameter("optionsOverride", int.class);
+    colorControl_stopMoveStep_commandParams.put(
+        "optionsOverride", colorControl_stopMoveStep_optionsOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo colorControl_stopMoveStep_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ColorControlCluster) cluster)
+                  .stopMoveStep(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("optionsMask"),
+                      (Integer) commandArguments.get("optionsOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControl_stopMoveStep_commandParams);
@@ -8526,6 +11425,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             colorControl_ClusterCommandInfo);
     clusterMap.put("colorControl", colorControl_clusterInfo);
     Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> contentLauncher_launchContent_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8536,17 +11436,44 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter launchContent_data_commandParameter =
         new CommandParameter("data", String.class);
     contentLauncher_launchContent_commandParams.add(launchContent_data_commandParameter);
+=======
+    Map<String, CommandParameter> contentLauncher_launchContent_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter contentLauncher_launchContent_commandParameter =
+        new CommandParameter(
+            "ContentLauncher",
+            ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
+    CommandParameter contentLauncher_launchContent_autoPlay_commandParameter =
+        new CommandParameter("autoPlay", boolean.class);
+    contentLauncher_launchContent_commandParams.put(
+        "autoPlay", contentLauncher_launchContent_autoPlay_commandParameter);
+
+    CommandParameter contentLauncher_launchContent_data_commandParameter =
+        new CommandParameter("data", String.class);
+    contentLauncher_launchContent_commandParams.put(
+        "data", contentLauncher_launchContent_data_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo contentLauncher_launchContent_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .launchContent(
+                      (ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback) callback,
+                      (Boolean) commandArguments.get("autoPlay"),
+                      (String) commandArguments.get("data"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             contentLauncher_launchContent_commandParams);
     contentLauncher_ClusterCommandInfo.put(
         "launchContent", contentLauncher_launchContent_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> contentLauncher_launchURL_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8557,12 +11484,37 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter launchURL_displayString_commandParameter =
         new CommandParameter("displayString", String.class);
     contentLauncher_launchURL_commandParams.add(launchURL_displayString_commandParameter);
+=======
+    Map<String, CommandParameter> contentLauncher_launchURL_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter contentLauncher_launchURL_commandParameter =
+        new CommandParameter(
+            "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
+    CommandParameter contentLauncher_launchURL_contentURL_commandParameter =
+        new CommandParameter("contentURL", String.class);
+    contentLauncher_launchURL_commandParams.put(
+        "contentURL", contentLauncher_launchURL_contentURL_commandParameter);
+
+    CommandParameter contentLauncher_launchURL_displayString_commandParameter =
+        new CommandParameter("displayString", String.class);
+    contentLauncher_launchURL_commandParams.put(
+        "displayString", contentLauncher_launchURL_displayString_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo contentLauncher_launchURL_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ContentLauncherCluster) cluster)
+                  .launchURL(
+                      (ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback) callback,
+                      (String) commandArguments.get("contentURL"),
+                      (String) commandArguments.get("displayString"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             contentLauncher_launchURL_commandParams);
@@ -8581,6 +11533,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             descriptor_ClusterCommandInfo);
     clusterMap.put("descriptor", descriptor_clusterInfo);
     Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8598,12 +11551,43 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("transferFileDesignator", byte[].class);
     diagnosticLogs_retrieveLogsRequest_commandParams.add(
         retrieveLogsRequest_transferFileDesignator_commandParameter);
+=======
+    Map<String, CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter diagnosticLogs_retrieveLogsRequest_commandParameter =
+        new CommandParameter("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter diagnosticLogs_retrieveLogsRequest_intent_commandParameter =
+        new CommandParameter("intent", int.class);
+    diagnosticLogs_retrieveLogsRequest_commandParams.put(
+        "intent", diagnosticLogs_retrieveLogsRequest_intent_commandParameter);
+
+    CommandParameter diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter =
+        new CommandParameter("requestedProtocol", int.class);
+    diagnosticLogs_retrieveLogsRequest_commandParams.put(
+        "requestedProtocol", diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter);
+
+    CommandParameter diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter =
+        new CommandParameter("transferFileDesignator", byte[].class);
+    diagnosticLogs_retrieveLogsRequest_commandParams.put(
+        "transferFileDesignator",
+        diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo diagnosticLogs_retrieveLogsRequest_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DiagnosticLogsCluster) cluster)
+                  .retrieveLogsRequest(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("intent"),
+                      (Integer) commandArguments.get("requestedProtocol"),
+                      (byte[]) commandArguments.get("transferFileDesignator"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             diagnosticLogs_retrieveLogsRequest_commandParams);
@@ -8616,30 +11600,61 @@ public Map<String, ClusterInfo> getClusterMap() {
             diagnosticLogs_ClusterCommandInfo);
     clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
     Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearAllPins_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> doorLock_clearAllPins_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearAllPins_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo doorLock_clearAllPins_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearAllPins(
+                      (ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearAllPins_commandParams);
     doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearAllRfids_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> doorLock_clearAllRfids_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearAllRfids_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo doorLock_clearAllRfids_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearAllRfids(
+                      (ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearAllRfids_commandParams);
     doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearHolidaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8647,47 +11662,105 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("scheduleId", int.class);
     doorLock_clearHolidaySchedule_commandParams.add(
         clearHolidaySchedule_scheduleId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_clearHolidaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearHolidaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
+    CommandParameter doorLock_clearHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearHolidaySchedule_commandParams.put(
+        "scheduleId", doorLock_clearHolidaySchedule_scheduleId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_clearHolidaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearHolidaySchedule(
+                      (ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
         "clearHolidaySchedule", doorLock_clearHolidaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearPin_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
     doorLock_clearPin_commandParams.add(clearPin_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_clearPin_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearPin_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
+    CommandParameter doorLock_clearPin_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearPin_commandParams.put("userId", doorLock_clearPin_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_clearPin_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearPin(
+                      (ChipClusters.DoorLockCluster.ClearPinResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearPin_commandParams);
     doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearRfid_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
     doorLock_clearRfid_commandParams.add(clearRfid_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_clearRfid_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearRfid_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
+    CommandParameter doorLock_clearRfid_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearRfid_commandParams.put("userId", doorLock_clearRfid_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_clearRfid_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearRfid(
+                      (ChipClusters.DoorLockCluster.ClearRfidResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearRfid_commandParams);
     doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearWeekdaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8699,17 +11772,43 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter clearWeekdaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
     doorLock_clearWeekdaySchedule_commandParams.add(clearWeekdaySchedule_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_clearWeekdaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearWeekdaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
+    CommandParameter doorLock_clearWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearWeekdaySchedule_commandParams.put(
+        "scheduleId", doorLock_clearWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_clearWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearWeekdaySchedule_commandParams.put(
+        "userId", doorLock_clearWeekdaySchedule_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_clearWeekdaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearWeekdaySchedule(
+                      (ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
         "clearWeekdaySchedule", doorLock_clearWeekdaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_clearYeardaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8721,95 +11820,217 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter clearYeardaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
     doorLock_clearYeardaySchedule_commandParams.add(clearYeardaySchedule_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_clearYeardaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_clearYeardaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
+    CommandParameter doorLock_clearYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_clearYeardaySchedule_commandParams.put(
+        "scheduleId", doorLock_clearYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_clearYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_clearYeardaySchedule_commandParams.put(
+        "userId", doorLock_clearYeardaySchedule_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_clearYeardaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .clearYeardaySchedule(
+                      (ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
         "clearYeardaySchedule", doorLock_clearYeardaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getHolidaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getHolidaySchedule_scheduleId_commandParameter =
         new CommandParameter("scheduleId", int.class);
     doorLock_getHolidaySchedule_commandParams.add(getHolidaySchedule_scheduleId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getHolidaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getHolidaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
+    CommandParameter doorLock_getHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getHolidaySchedule_commandParams.put(
+        "scheduleId", doorLock_getHolidaySchedule_scheduleId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getHolidaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getHolidaySchedule(
+                      (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getLogRecord_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getLogRecord_logIndex_commandParameter =
         new CommandParameter("logIndex", int.class);
     doorLock_getLogRecord_commandParams.add(getLogRecord_logIndex_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getLogRecord_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getLogRecord_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
+    CommandParameter doorLock_getLogRecord_logIndex_commandParameter =
+        new CommandParameter("logIndex", int.class);
+    doorLock_getLogRecord_commandParams.put(
+        "logIndex", doorLock_getLogRecord_logIndex_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getLogRecord_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getLogRecord(
+                      (ChipClusters.DoorLockCluster.GetLogRecordResponseCallback) callback,
+                      (Integer) commandArguments.get("logIndex"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getLogRecord_commandParams);
     doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getPin_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getPin_userId_commandParameter = new CommandParameter("userId", int.class);
     doorLock_getPin_commandParams.add(getPin_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getPin_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getPin_commandParameter =
+        new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
+    CommandParameter doorLock_getPin_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getPin_commandParams.put("userId", doorLock_getPin_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getPin_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getPin(
+                      (ChipClusters.DoorLockCluster.GetPinResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getPin_commandParams);
     doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getRfid_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
     doorLock_getRfid_commandParams.add(getRfid_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getRfid_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getRfid_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
+    CommandParameter doorLock_getRfid_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getRfid_commandParams.put("userId", doorLock_getRfid_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getRfid_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getRfid(
+                      (ChipClusters.DoorLockCluster.GetRfidResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getRfid_commandParams);
     doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getUserType_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getUserType_userId_commandParameter =
         new CommandParameter("userId", int.class);
     doorLock_getUserType_commandParams.add(getUserType_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getUserType_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getUserType_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
+    CommandParameter doorLock_getUserType_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getUserType_commandParams.put("userId", doorLock_getUserType_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getUserType_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getUserType(
+                      (ChipClusters.DoorLockCluster.GetUserTypeResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getUserType_commandParams);
     doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getWeekdaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8820,16 +12041,42 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter getWeekdaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
     doorLock_getWeekdaySchedule_commandParams.add(getWeekdaySchedule_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getWeekdaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getWeekdaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
+    CommandParameter doorLock_getWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getWeekdaySchedule_commandParams.put(
+        "scheduleId", doorLock_getWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_getWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getWeekdaySchedule_commandParams.put(
+        "userId", doorLock_getWeekdaySchedule_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getWeekdaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getWeekdaySchedule(
+                      (ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_getYeardaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8840,31 +12087,76 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter getYeardaySchedule_userId_commandParameter =
         new CommandParameter("userId", int.class);
     doorLock_getYeardaySchedule_commandParams.add(getYeardaySchedule_userId_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_getYeardaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_getYeardaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
+    CommandParameter doorLock_getYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_getYeardaySchedule_commandParams.put(
+        "scheduleId", doorLock_getYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_getYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_getYeardaySchedule_commandParams.put(
+        "userId", doorLock_getYeardaySchedule_userId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_getYeardaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .getYeardaySchedule(
+                      (ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_lockDoor_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
     doorLock_lockDoor_commandParams.add(lockDoor_pin_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_lockDoor_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_lockDoor_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
+    CommandParameter doorLock_lockDoor_pin_commandParameter =
+        new CommandParameter("pin", byte[].class);
+    doorLock_lockDoor_commandParams.put("pin", doorLock_lockDoor_pin_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_lockDoor_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .lockDoor(
+                      (ChipClusters.DoorLockCluster.LockDoorResponseCallback) callback,
+                      (byte[]) commandArguments.get("pin"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_lockDoor_commandParams);
     doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setHolidaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8885,16 +12177,55 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("operatingModeDuringHoliday", int.class);
     doorLock_setHolidaySchedule_commandParams.add(
         setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setHolidaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setHolidaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
+    CommandParameter doorLock_setHolidaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setHolidaySchedule_commandParams.put(
+        "scheduleId", doorLock_setHolidaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_setHolidaySchedule_localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    doorLock_setHolidaySchedule_commandParams.put(
+        "localStartTime", doorLock_setHolidaySchedule_localStartTime_commandParameter);
+
+    CommandParameter doorLock_setHolidaySchedule_localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    doorLock_setHolidaySchedule_commandParams.put(
+        "localEndTime", doorLock_setHolidaySchedule_localEndTime_commandParameter);
+
+    CommandParameter doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter =
+        new CommandParameter("operatingModeDuringHoliday", int.class);
+    doorLock_setHolidaySchedule_commandParams.put(
+        "operatingModeDuringHoliday",
+        doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setHolidaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setHolidaySchedule(
+                      (ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Long) commandArguments.get("localStartTime"),
+                      (Long) commandArguments.get("localEndTime"),
+                      (Integer) commandArguments.get("operatingModeDuringHoliday"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setPin_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8910,16 +12241,49 @@ public Map<String, ClusterInfo> getClusterMap() {
 
     CommandParameter setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
     doorLock_setPin_commandParams.add(setPin_pin_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setPin_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setPin_commandParameter =
+        new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
+    CommandParameter doorLock_setPin_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setPin_commandParams.put("userId", doorLock_setPin_userId_commandParameter);
+
+    CommandParameter doorLock_setPin_userStatus_commandParameter =
+        new CommandParameter("userStatus", int.class);
+    doorLock_setPin_commandParams.put("userStatus", doorLock_setPin_userStatus_commandParameter);
+
+    CommandParameter doorLock_setPin_userType_commandParameter =
+        new CommandParameter("userType", int.class);
+    doorLock_setPin_commandParams.put("userType", doorLock_setPin_userType_commandParameter);
+
+    CommandParameter doorLock_setPin_pin_commandParameter =
+        new CommandParameter("pin", byte[].class);
+    doorLock_setPin_commandParams.put("pin", doorLock_setPin_pin_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setPin_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setPin(
+                      (ChipClusters.DoorLockCluster.SetPinResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"),
+                      (Integer) commandArguments.get("userStatus"),
+                      (Integer) commandArguments.get("userType"),
+                      (byte[]) commandArguments.get("pin"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setPin_commandParams);
     doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setRfid_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8936,16 +12300,50 @@ public Map<String, ClusterInfo> getClusterMap() {
 
     CommandParameter setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
     doorLock_setRfid_commandParams.add(setRfid_id_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setRfid_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setRfid_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
+    CommandParameter doorLock_setRfid_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setRfid_commandParams.put("userId", doorLock_setRfid_userId_commandParameter);
+
+    CommandParameter doorLock_setRfid_userStatus_commandParameter =
+        new CommandParameter("userStatus", int.class);
+    doorLock_setRfid_commandParams.put("userStatus", doorLock_setRfid_userStatus_commandParameter);
+
+    CommandParameter doorLock_setRfid_userType_commandParameter =
+        new CommandParameter("userType", int.class);
+    doorLock_setRfid_commandParams.put("userType", doorLock_setRfid_userType_commandParameter);
+
+    CommandParameter doorLock_setRfid_id_commandParameter =
+        new CommandParameter("id", byte[].class);
+    doorLock_setRfid_commandParams.put("id", doorLock_setRfid_id_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setRfid_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setRfid(
+                      (ChipClusters.DoorLockCluster.SetRfidResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"),
+                      (Integer) commandArguments.get("userStatus"),
+                      (Integer) commandArguments.get("userType"),
+                      (byte[]) commandArguments.get("id"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setRfid_commandParams);
     doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setUserType_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8956,16 +12354,41 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter setUserType_userType_commandParameter =
         new CommandParameter("userType", int.class);
     doorLock_setUserType_commandParams.add(setUserType_userType_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setUserType_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setUserType_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
+    CommandParameter doorLock_setUserType_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setUserType_commandParams.put("userId", doorLock_setUserType_userId_commandParameter);
+
+    CommandParameter doorLock_setUserType_userType_commandParameter =
+        new CommandParameter("userType", int.class);
+    doorLock_setUserType_commandParams.put(
+        "userType", doorLock_setUserType_userType_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setUserType_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setUserType(
+                      (ChipClusters.DoorLockCluster.SetUserTypeResponseCallback) callback,
+                      (Integer) commandArguments.get("userId"),
+                      (Integer) commandArguments.get("userType"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setUserType_commandParams);
     doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setWeekdaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -8996,16 +12419,72 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter setWeekdaySchedule_endMinute_commandParameter =
         new CommandParameter("endMinute", int.class);
     doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_endMinute_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setWeekdaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setWeekdaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
+    CommandParameter doorLock_setWeekdaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "scheduleId", doorLock_setWeekdaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "userId", doorLock_setWeekdaySchedule_userId_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_daysMask_commandParameter =
+        new CommandParameter("daysMask", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "daysMask", doorLock_setWeekdaySchedule_daysMask_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_startHour_commandParameter =
+        new CommandParameter("startHour", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "startHour", doorLock_setWeekdaySchedule_startHour_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_startMinute_commandParameter =
+        new CommandParameter("startMinute", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "startMinute", doorLock_setWeekdaySchedule_startMinute_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_endHour_commandParameter =
+        new CommandParameter("endHour", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "endHour", doorLock_setWeekdaySchedule_endHour_commandParameter);
+
+    CommandParameter doorLock_setWeekdaySchedule_endMinute_commandParameter =
+        new CommandParameter("endMinute", int.class);
+    doorLock_setWeekdaySchedule_commandParams.put(
+        "endMinute", doorLock_setWeekdaySchedule_endMinute_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setWeekdaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setWeekdaySchedule(
+                      (ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"),
+                      (Integer) commandArguments.get("daysMask"),
+                      (Integer) commandArguments.get("startHour"),
+                      (Integer) commandArguments.get("startMinute"),
+                      (Integer) commandArguments.get("endHour"),
+                      (Integer) commandArguments.get("endMinute"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_setYeardaySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9025,31 +12504,88 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter setYeardaySchedule_localEndTime_commandParameter =
         new CommandParameter("localEndTime", long.class);
     doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_localEndTime_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_setYeardaySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_setYeardaySchedule_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
+    CommandParameter doorLock_setYeardaySchedule_scheduleId_commandParameter =
+        new CommandParameter("scheduleId", int.class);
+    doorLock_setYeardaySchedule_commandParams.put(
+        "scheduleId", doorLock_setYeardaySchedule_scheduleId_commandParameter);
+
+    CommandParameter doorLock_setYeardaySchedule_userId_commandParameter =
+        new CommandParameter("userId", int.class);
+    doorLock_setYeardaySchedule_commandParams.put(
+        "userId", doorLock_setYeardaySchedule_userId_commandParameter);
+
+    CommandParameter doorLock_setYeardaySchedule_localStartTime_commandParameter =
+        new CommandParameter("localStartTime", long.class);
+    doorLock_setYeardaySchedule_commandParams.put(
+        "localStartTime", doorLock_setYeardaySchedule_localStartTime_commandParameter);
+
+    CommandParameter doorLock_setYeardaySchedule_localEndTime_commandParameter =
+        new CommandParameter("localEndTime", long.class);
+    doorLock_setYeardaySchedule_commandParams.put(
+        "localEndTime", doorLock_setYeardaySchedule_localEndTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_setYeardaySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .setYeardaySchedule(
+                      (ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback) callback,
+                      (Integer) commandArguments.get("scheduleId"),
+                      (Integer) commandArguments.get("userId"),
+                      (Long) commandArguments.get("localStartTime"),
+                      (Long) commandArguments.get("localEndTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_unlockDoor_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
     doorLock_unlockDoor_commandParams.add(unlockDoor_pin_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_unlockDoor_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_unlockDoor_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
+    CommandParameter doorLock_unlockDoor_pin_commandParameter =
+        new CommandParameter("pin", byte[].class);
+    doorLock_unlockDoor_commandParams.put("pin", doorLock_unlockDoor_pin_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_unlockDoor_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .unlockDoor(
+                      (ChipClusters.DoorLockCluster.UnlockDoorResponseCallback) callback,
+                      (byte[]) commandArguments.get("pin"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_unlockDoor_commandParams);
     doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> doorLock_unlockWithTimeout_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9061,12 +12597,37 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter unlockWithTimeout_pin_commandParameter =
         new CommandParameter("pin", byte[].class);
     doorLock_unlockWithTimeout_commandParams.add(unlockWithTimeout_pin_commandParameter);
+=======
+    Map<String, CommandParameter> doorLock_unlockWithTimeout_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter doorLock_unlockWithTimeout_commandParameter =
+        new CommandParameter(
+            "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
+    CommandParameter doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter =
+        new CommandParameter("timeoutInSeconds", int.class);
+    doorLock_unlockWithTimeout_commandParams.put(
+        "timeoutInSeconds", doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter);
+
+    CommandParameter doorLock_unlockWithTimeout_pin_commandParameter =
+        new CommandParameter("pin", byte[].class);
+    doorLock_unlockWithTimeout_commandParams.put(
+        "pin", doorLock_unlockWithTimeout_pin_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo doorLock_unlockWithTimeout_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.DoorLockCluster) cluster)
+                  .unlockWithTimeout(
+                      (ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback) callback,
+                      (Integer) commandArguments.get("timeoutInSeconds"),
+                      (byte[]) commandArguments.get("pin"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_unlockWithTimeout_commandParams);
@@ -9085,14 +12646,28 @@ public Map<String, ClusterInfo> getClusterMap() {
             electricalMeasurement_ClusterCommandInfo);
     clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
     Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter ethernetNetworkDiagnostics_resetCounts_commandParameter =
+        new CommandParameter(
+            "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo ethernetNetworkDiagnostics_resetCounts_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             ethernetNetworkDiagnostics_resetCounts_commandParams);
@@ -9120,6 +12695,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             flowMeasurement_ClusterCommandInfo);
     clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
     Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> generalCommissioning_armFailSafe_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9135,31 +12711,84 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter armFailSafe_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
     generalCommissioning_armFailSafe_commandParams.add(armFailSafe_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> generalCommissioning_armFailSafe_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter generalCommissioning_armFailSafe_commandParameter =
+        new CommandParameter(
+            "GeneralCommissioning",
+            ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
+    CommandParameter generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter =
+        new CommandParameter("expiryLengthSeconds", int.class);
+    generalCommissioning_armFailSafe_commandParams.put(
+        "expiryLengthSeconds",
+        generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter);
+
+    CommandParameter generalCommissioning_armFailSafe_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    generalCommissioning_armFailSafe_commandParams.put(
+        "breadcrumb", generalCommissioning_armFailSafe_breadcrumb_commandParameter);
+
+    CommandParameter generalCommissioning_armFailSafe_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    generalCommissioning_armFailSafe_commandParams.put(
+        "timeoutMs", generalCommissioning_armFailSafe_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo generalCommissioning_armFailSafe_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .armFailSafe(
+                      (ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("expiryLengthSeconds"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             generalCommissioning_armFailSafe_commandParams);
     generalCommissioning_ClusterCommandInfo.put(
         "armFailSafe", generalCommissioning_armFailSafe_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> generalCommissioning_commissioningComplete_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> generalCommissioning_commissioningComplete_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter generalCommissioning_commissioningComplete_commandParameter =
+        new CommandParameter(
+            "GeneralCommissioning",
+            ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo generalCommissioning_commissioningComplete_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .commissioningComplete(
+                      (ChipClusters.GeneralCommissioningCluster
+                              .CommissioningCompleteResponseCallback)
+                          callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             generalCommissioning_commissioningComplete_commandParams);
     generalCommissioning_ClusterCommandInfo.put(
         "commissioningComplete", generalCommissioning_commissioningComplete_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -9183,12 +12812,51 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     generalCommissioning_setRegulatoryConfig_commandParams.add(
         setRegulatoryConfig_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter generalCommissioning_setRegulatoryConfig_commandParameter =
+        new CommandParameter(
+            "GeneralCommissioning",
+            ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
+    CommandParameter generalCommissioning_setRegulatoryConfig_location_commandParameter =
+        new CommandParameter("location", int.class);
+    generalCommissioning_setRegulatoryConfig_commandParams.put(
+        "location", generalCommissioning_setRegulatoryConfig_location_commandParameter);
+
+    CommandParameter generalCommissioning_setRegulatoryConfig_countryCode_commandParameter =
+        new CommandParameter("countryCode", String.class);
+    generalCommissioning_setRegulatoryConfig_commandParams.put(
+        "countryCode", generalCommissioning_setRegulatoryConfig_countryCode_commandParameter);
+
+    CommandParameter generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    generalCommissioning_setRegulatoryConfig_commandParams.put(
+        "breadcrumb", generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter);
+
+    CommandParameter generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    generalCommissioning_setRegulatoryConfig_commandParams.put(
+        "timeoutMs", generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo generalCommissioning_setRegulatoryConfig_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GeneralCommissioningCluster) cluster)
+                  .setRegulatoryConfig(
+                      (ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("location"),
+                      (String) commandArguments.get("countryCode"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             generalCommissioning_setRegulatoryConfig_commandParams);
@@ -9215,6 +12883,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             groupKeyManagement_ClusterCommandInfo);
     clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
     Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> groups_addGroup_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9224,16 +12893,39 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter addGroup_groupName_commandParameter =
         new CommandParameter("groupName", String.class);
     groups_addGroup_commandParams.add(addGroup_groupName_commandParameter);
+=======
+    Map<String, CommandParameter> groups_addGroup_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_addGroup_commandParameter =
+        new CommandParameter("Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
+    CommandParameter groups_addGroup_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_addGroup_commandParams.put("groupId", groups_addGroup_groupId_commandParameter);
+
+    CommandParameter groups_addGroup_groupName_commandParameter =
+        new CommandParameter("groupName", String.class);
+    groups_addGroup_commandParams.put("groupName", groups_addGroup_groupName_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo groups_addGroup_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .addGroup(
+                      (ChipClusters.GroupsCluster.AddGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (String) commandArguments.get("groupName"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_addGroup_commandParams);
     groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> groups_addGroupIfIdentifying_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9245,17 +12937,42 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("groupName", String.class);
     groups_addGroupIfIdentifying_commandParams.add(
         addGroupIfIdentifying_groupName_commandParameter);
+=======
+    Map<String, CommandParameter> groups_addGroupIfIdentifying_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_addGroupIfIdentifying_commandParameter =
+        new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter groups_addGroupIfIdentifying_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_addGroupIfIdentifying_commandParams.put(
+        "groupId", groups_addGroupIfIdentifying_groupId_commandParameter);
+
+    CommandParameter groups_addGroupIfIdentifying_groupName_commandParameter =
+        new CommandParameter("groupName", String.class);
+    groups_addGroupIfIdentifying_commandParams.put(
+        "groupName", groups_addGroupIfIdentifying_groupName_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo groups_addGroupIfIdentifying_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .addGroupIfIdentifying(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (String) commandArguments.get("groupName"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_addGroupIfIdentifying_commandParams);
     groups_ClusterCommandInfo.put(
         "addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> groups_getGroupMembership_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9266,56 +12983,131 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter getGroupMembership_groupList_commandParameter =
         new CommandParameter("groupList", int.class);
     groups_getGroupMembership_commandParams.add(getGroupMembership_groupList_commandParameter);
+=======
+    Map<String, CommandParameter> groups_getGroupMembership_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_getGroupMembership_commandParameter =
+        new CommandParameter(
+            "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
+    CommandParameter groups_getGroupMembership_groupCount_commandParameter =
+        new CommandParameter("groupCount", int.class);
+    groups_getGroupMembership_commandParams.put(
+        "groupCount", groups_getGroupMembership_groupCount_commandParameter);
+
+    CommandParameter groups_getGroupMembership_groupList_commandParameter =
+        new CommandParameter("groupList", int.class);
+    groups_getGroupMembership_commandParams.put(
+        "groupList", groups_getGroupMembership_groupList_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo groups_getGroupMembership_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .getGroupMembership(
+                      (ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback,
+                      (Integer) commandArguments.get("groupCount"),
+                      (Integer) commandArguments.get("groupList"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_getGroupMembership_commandParams);
     groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> groups_removeAllGroups_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> groups_removeAllGroups_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_removeAllGroups_commandParameter =
+        new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo groups_removeAllGroups_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .removeAllGroups((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_removeAllGroups_commandParams);
     groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> groups_removeGroup_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter removeGroup_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
     groups_removeGroup_commandParams.add(removeGroup_groupId_commandParameter);
+=======
+    Map<String, CommandParameter> groups_removeGroup_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_removeGroup_commandParameter =
+        new CommandParameter(
+            "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
+    CommandParameter groups_removeGroup_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_removeGroup_commandParams.put("groupId", groups_removeGroup_groupId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo groups_removeGroup_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .removeGroup(
+                      (ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_removeGroup_commandParams);
     groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> groups_viewGroup_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter viewGroup_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
     groups_viewGroup_commandParams.add(viewGroup_groupId_commandParameter);
+=======
+    Map<String, CommandParameter> groups_viewGroup_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter groups_viewGroup_commandParameter =
+        new CommandParameter("Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
+    CommandParameter groups_viewGroup_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    groups_viewGroup_commandParams.put("groupId", groups_viewGroup_groupId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo groups_viewGroup_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.GroupsCluster) cluster)
+                  .viewGroup(
+                      (ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             groups_viewGroup_commandParams);
@@ -9327,34 +13119,69 @@ public Map<String, ClusterInfo> getClusterMap() {
             groups_ClusterCommandInfo);
     clusterMap.put("groups", groups_clusterInfo);
     Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> identify_identify_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter identify_identifyTime_commandParameter =
         new CommandParameter("identifyTime", int.class);
     identify_identify_commandParams.add(identify_identifyTime_commandParameter);
+=======
+    Map<String, CommandParameter> identify_identify_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter identify_identify_commandParameter =
+        new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter identify_identify_identifyTime_commandParameter =
+        new CommandParameter("identifyTime", int.class);
+    identify_identify_commandParams.put(
+        "identifyTime", identify_identify_identifyTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo identify_identify_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .identify(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("identifyTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             identify_identify_commandParams);
     identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> identify_identifyQuery_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> identify_identifyQuery_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter identify_identifyQuery_commandParameter =
+        new CommandParameter(
+            "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo identify_identifyQuery_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .identifyQuery(
+                      (ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             identify_identifyQuery_commandParams);
     identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> identify_triggerEffect_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9365,12 +13192,36 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter triggerEffect_effectVariant_commandParameter =
         new CommandParameter("effectVariant", int.class);
     identify_triggerEffect_commandParams.add(triggerEffect_effectVariant_commandParameter);
+=======
+    Map<String, CommandParameter> identify_triggerEffect_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter identify_triggerEffect_commandParameter =
+        new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter identify_triggerEffect_effectIdentifier_commandParameter =
+        new CommandParameter("effectIdentifier", int.class);
+    identify_triggerEffect_commandParams.put(
+        "effectIdentifier", identify_triggerEffect_effectIdentifier_commandParameter);
+
+    CommandParameter identify_triggerEffect_effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    identify_triggerEffect_commandParams.put(
+        "effectVariant", identify_triggerEffect_effectVariant_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo identify_triggerEffect_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.IdentifyCluster) cluster)
+                  .triggerEffect(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("effectIdentifier"),
+                      (Integer) commandArguments.get("effectVariant"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             identify_triggerEffect_commandParams);
@@ -9382,17 +13233,36 @@ public Map<String, ClusterInfo> getClusterMap() {
             identify_ClusterCommandInfo);
     clusterMap.put("identify", identify_clusterInfo);
     Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> keypadInput_sendKey_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
     keypadInput_sendKey_commandParams.add(sendKey_keyCode_commandParameter);
+=======
+    Map<String, CommandParameter> keypadInput_sendKey_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter keypadInput_sendKey_commandParameter =
+        new CommandParameter(
+            "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
+    CommandParameter keypadInput_sendKey_keyCode_commandParameter =
+        new CommandParameter("keyCode", int.class);
+    keypadInput_sendKey_commandParams.put("keyCode", keypadInput_sendKey_keyCode_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo keypadInput_sendKey_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.KeypadInputCluster) cluster)
+                  .sendKey(
+                      (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback,
+                      (Integer) commandArguments.get("keyCode"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             keypadInput_sendKey_commandParams);
@@ -9404,6 +13274,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             keypadInput_ClusterCommandInfo);
     clusterMap.put("keypadInput", keypadInput_clusterInfo);
     Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> levelControl_move_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9420,16 +13291,51 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter move_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
     levelControl_move_commandParams.add(move_optionOverride_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_move_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_move_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_move_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    levelControl_move_commandParams.put("moveMode", levelControl_move_moveMode_commandParameter);
+
+    CommandParameter levelControl_move_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    levelControl_move_commandParams.put("rate", levelControl_move_rate_commandParameter);
+
+    CommandParameter levelControl_move_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_move_commandParams.put(
+        "optionMask", levelControl_move_optionMask_commandParameter);
+
+    CommandParameter levelControl_move_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_move_commandParams.put(
+        "optionOverride", levelControl_move_optionOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_move_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .move(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_move_commandParams);
     levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_moveToLevel_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9447,16 +13353,53 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter moveToLevel_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
     levelControl_moveToLevel_commandParams.add(moveToLevel_optionOverride_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_moveToLevel_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_moveToLevel_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_moveToLevel_level_commandParameter =
+        new CommandParameter("level", int.class);
+    levelControl_moveToLevel_commandParams.put(
+        "level", levelControl_moveToLevel_level_commandParameter);
+
+    CommandParameter levelControl_moveToLevel_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_moveToLevel_commandParams.put(
+        "transitionTime", levelControl_moveToLevel_transitionTime_commandParameter);
+
+    CommandParameter levelControl_moveToLevel_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_moveToLevel_commandParams.put(
+        "optionMask", levelControl_moveToLevel_optionMask_commandParameter);
+
+    CommandParameter levelControl_moveToLevel_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_moveToLevel_commandParams.put(
+        "optionOverride", levelControl_moveToLevel_optionOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_moveToLevel_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveToLevel(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("level"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_moveToLevel_commandParams);
     levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_moveToLevelWithOnOff_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9469,17 +13412,42 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("transitionTime", int.class);
     levelControl_moveToLevelWithOnOff_commandParams.add(
         moveToLevelWithOnOff_transitionTime_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_moveToLevelWithOnOff_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_moveToLevelWithOnOff_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_moveToLevelWithOnOff_level_commandParameter =
+        new CommandParameter("level", int.class);
+    levelControl_moveToLevelWithOnOff_commandParams.put(
+        "level", levelControl_moveToLevelWithOnOff_level_commandParameter);
+
+    CommandParameter levelControl_moveToLevelWithOnOff_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_moveToLevelWithOnOff_commandParams.put(
+        "transitionTime", levelControl_moveToLevelWithOnOff_transitionTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_moveToLevelWithOnOff_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveToLevelWithOnOff(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("level"),
+                      (Integer) commandArguments.get("transitionTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_moveToLevelWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put(
         "moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_moveWithOnOff_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9489,16 +13457,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 
     CommandParameter moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
     levelControl_moveWithOnOff_commandParams.add(moveWithOnOff_rate_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_moveWithOnOff_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_moveWithOnOff_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_moveWithOnOff_moveMode_commandParameter =
+        new CommandParameter("moveMode", int.class);
+    levelControl_moveWithOnOff_commandParams.put(
+        "moveMode", levelControl_moveWithOnOff_moveMode_commandParameter);
+
+    CommandParameter levelControl_moveWithOnOff_rate_commandParameter =
+        new CommandParameter("rate", int.class);
+    levelControl_moveWithOnOff_commandParams.put(
+        "rate", levelControl_moveWithOnOff_rate_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_moveWithOnOff_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .moveWithOnOff(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("moveMode"),
+                      (Integer) commandArguments.get("rate"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_moveWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_step_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9519,16 +13512,57 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter step_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
     levelControl_step_commandParams.add(step_optionOverride_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_step_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_step_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_step_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    levelControl_step_commandParams.put("stepMode", levelControl_step_stepMode_commandParameter);
+
+    CommandParameter levelControl_step_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    levelControl_step_commandParams.put("stepSize", levelControl_step_stepSize_commandParameter);
+
+    CommandParameter levelControl_step_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_step_commandParams.put(
+        "transitionTime", levelControl_step_transitionTime_commandParameter);
+
+    CommandParameter levelControl_step_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_step_commandParams.put(
+        "optionMask", levelControl_step_optionMask_commandParameter);
+
+    CommandParameter levelControl_step_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_step_commandParams.put(
+        "optionOverride", levelControl_step_optionOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_step_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .step(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_step_commandParams);
     levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_stepWithOnOff_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9543,16 +13577,47 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stepWithOnOff_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
     levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_transitionTime_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_stepWithOnOff_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_stepWithOnOff_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_stepWithOnOff_stepMode_commandParameter =
+        new CommandParameter("stepMode", int.class);
+    levelControl_stepWithOnOff_commandParams.put(
+        "stepMode", levelControl_stepWithOnOff_stepMode_commandParameter);
+
+    CommandParameter levelControl_stepWithOnOff_stepSize_commandParameter =
+        new CommandParameter("stepSize", int.class);
+    levelControl_stepWithOnOff_commandParams.put(
+        "stepSize", levelControl_stepWithOnOff_stepSize_commandParameter);
+
+    CommandParameter levelControl_stepWithOnOff_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    levelControl_stepWithOnOff_commandParams.put(
+        "transitionTime", levelControl_stepWithOnOff_transitionTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_stepWithOnOff_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stepWithOnOff(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("stepMode"),
+                      (Integer) commandArguments.get("stepSize"),
+                      (Integer) commandArguments.get("transitionTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_stepWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_stop_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9563,24 +13628,61 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter stop_optionOverride_commandParameter =
         new CommandParameter("optionOverride", int.class);
     levelControl_stop_commandParams.add(stop_optionOverride_commandParameter);
+=======
+    Map<String, CommandParameter> levelControl_stop_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_stop_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter levelControl_stop_optionMask_commandParameter =
+        new CommandParameter("optionMask", int.class);
+    levelControl_stop_commandParams.put(
+        "optionMask", levelControl_stop_optionMask_commandParameter);
+
+    CommandParameter levelControl_stop_optionOverride_commandParameter =
+        new CommandParameter("optionOverride", int.class);
+    levelControl_stop_commandParams.put(
+        "optionOverride", levelControl_stop_optionOverride_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo levelControl_stop_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stop(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("optionMask"),
+                      (Integer) commandArguments.get("optionOverride"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_stop_commandParams);
     levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> levelControl_stopWithOnOff_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> levelControl_stopWithOnOff_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter levelControl_stopWithOnOff_commandParameter =
+        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo levelControl_stopWithOnOff_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LevelControlCluster) cluster)
+                  .stopWithOnOff((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControl_stopWithOnOff_commandParams);
@@ -9592,14 +13694,26 @@ public Map<String, ClusterInfo> getClusterMap() {
             levelControl_ClusterCommandInfo);
     clusterMap.put("levelControl", levelControl_clusterInfo);
     Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> lowPower_sleep_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> lowPower_sleep_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter lowPower_sleep_commandParameter =
+        new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo lowPower_sleep_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.LowPowerCluster) cluster).sleep((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             lowPower_sleep_commandParams);
@@ -9611,18 +13725,32 @@ public Map<String, ClusterInfo> getClusterMap() {
             lowPower_ClusterCommandInfo);
     clusterMap.put("lowPower", lowPower_clusterInfo);
     Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> mediaInput_hideInputStatus_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaInput_hideInputStatus_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaInput_hideInputStatus_commandParameter =
+        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaInput_hideInputStatus_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .hideInputStatus((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaInput_hideInputStatus_commandParams);
     mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaInput_renameInput_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9631,39 +13759,93 @@ public Map<String, ClusterInfo> getClusterMap() {
 
     CommandParameter renameInput_name_commandParameter = new CommandParameter("name", String.class);
     mediaInput_renameInput_commandParams.add(renameInput_name_commandParameter);
+=======
+    Map<String, CommandParameter> mediaInput_renameInput_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaInput_renameInput_commandParameter =
+        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter mediaInput_renameInput_index_commandParameter =
+        new CommandParameter("index", int.class);
+    mediaInput_renameInput_commandParams.put(
+        "index", mediaInput_renameInput_index_commandParameter);
+
+    CommandParameter mediaInput_renameInput_name_commandParameter =
+        new CommandParameter("name", String.class);
+    mediaInput_renameInput_commandParams.put("name", mediaInput_renameInput_name_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo mediaInput_renameInput_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .renameInput(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("index"),
+                      (String) commandArguments.get("name"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaInput_renameInput_commandParams);
     mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaInput_selectInput_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter selectInput_index_commandParameter = new CommandParameter("index", int.class);
     mediaInput_selectInput_commandParams.add(selectInput_index_commandParameter);
+=======
+    Map<String, CommandParameter> mediaInput_selectInput_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaInput_selectInput_commandParameter =
+        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter mediaInput_selectInput_index_commandParameter =
+        new CommandParameter("index", int.class);
+    mediaInput_selectInput_commandParams.put(
+        "index", mediaInput_selectInput_index_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo mediaInput_selectInput_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .selectInput(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaInput_selectInput_commandParams);
     mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaInput_showInputStatus_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaInput_showInputStatus_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaInput_showInputStatus_commandParameter =
+        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaInput_showInputStatus_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaInputCluster) cluster)
+                  .showInputStatus((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaInput_showInputStatus_commandParams);
@@ -9675,95 +13857,208 @@ public Map<String, ClusterInfo> getClusterMap() {
             mediaInput_ClusterCommandInfo);
     clusterMap.put("mediaInput", mediaInput_clusterInfo);
     Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaFastForward_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaFastForward_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaFastForward_commandParameter =
+        new CommandParameter(
+            "MediaPlayback",
+            ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaFastForward_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaFastForward(
+                      (ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback)
+                          callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaFastForward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
         "mediaFastForward", mediaPlayback_mediaFastForward_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaNext_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaNext_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaNext_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaNext_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaNext(
+                      (ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaNext_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaPause_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaPause_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaPause_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaPause_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaPause(
+                      (ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPause_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaPlay_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaPlay_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaPlay_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaPlay_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaPlay(
+                      (ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPlay_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaPrevious_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaPrevious_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaPrevious_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaPrevious_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaPrevious(
+                      (ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPrevious_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaRewind_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaRewind_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaRewind_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaRewind_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaRewind(
+                      (ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaRewind_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaSeek_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter mediaSeek_position_commandParameter =
         new CommandParameter("position", long.class);
     mediaPlayback_mediaSeek_commandParams.add(mediaSeek_position_commandParameter);
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaSeek_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaSeek_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
+    CommandParameter mediaPlayback_mediaSeek_position_commandParameter =
+        new CommandParameter("position", long.class);
+    mediaPlayback_mediaSeek_commandParams.put(
+        "position", mediaPlayback_mediaSeek_position_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo mediaPlayback_mediaSeek_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaSeek(
+                      (ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback) callback,
+                      (Long) commandArguments.get("position"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSeek_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaSkipBackward_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9771,17 +14066,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("deltaPositionMilliseconds", long.class);
     mediaPlayback_mediaSkipBackward_commandParams.add(
         mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaSkipBackward_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaSkipBackward_commandParameter =
+        new CommandParameter(
+            "MediaPlayback",
+            ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
+    CommandParameter mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaPlayback_mediaSkipBackward_commandParams.put(
+        "deltaPositionMilliseconds",
+        mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo mediaPlayback_mediaSkipBackward_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaSkipBackward(
+                      (ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback)
+                          callback,
+                      (Long) commandArguments.get("deltaPositionMilliseconds"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSkipBackward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
         "mediaSkipBackward", mediaPlayback_mediaSkipBackward_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaSkipForward_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9789,38 +14107,90 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("deltaPositionMilliseconds", long.class);
     mediaPlayback_mediaSkipForward_commandParams.add(
         mediaSkipForward_deltaPositionMilliseconds_commandParameter);
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaSkipForward_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaSkipForward_commandParameter =
+        new CommandParameter(
+            "MediaPlayback",
+            ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
+    CommandParameter mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter =
+        new CommandParameter("deltaPositionMilliseconds", long.class);
+    mediaPlayback_mediaSkipForward_commandParams.put(
+        "deltaPositionMilliseconds",
+        mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo mediaPlayback_mediaSkipForward_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaSkipForward(
+                      (ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback) callback,
+                      (Long) commandArguments.get("deltaPositionMilliseconds"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSkipForward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
         "mediaSkipForward", mediaPlayback_mediaSkipForward_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaStartOver_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaStartOver_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaStartOver_commandParameter =
+        new CommandParameter(
+            "MediaPlayback",
+            ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaStartOver_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaStartOver(
+                      (ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaStartOver_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
         "mediaStartOver", mediaPlayback_mediaStartOver_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> mediaPlayback_mediaStop_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> mediaPlayback_mediaStop_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter mediaPlayback_mediaStop_commandParameter =
+        new CommandParameter(
+            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo mediaPlayback_mediaStop_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.MediaPlaybackCluster) cluster)
+                  .mediaStop(
+                      (ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaStop_commandParams);
@@ -9832,6 +14202,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             mediaPlayback_ClusterCommandInfo);
     clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
     Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_addThreadNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9849,17 +14220,52 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_addThreadNetwork_commandParams.add(
         addThreadNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_addThreadNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_addThreadNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_addThreadNetwork_operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    networkCommissioning_addThreadNetwork_commandParams.put(
+        "operationalDataset",
+        networkCommissioning_addThreadNetwork_operationalDataset_commandParameter);
+
+    CommandParameter networkCommissioning_addThreadNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_addThreadNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_addThreadNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_addThreadNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_addThreadNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_addThreadNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_addThreadNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .addThreadNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("operationalDataset"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_addThreadNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "addThreadNetwork", networkCommissioning_addThreadNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_addWiFiNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9881,17 +14287,57 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_addWiFiNetwork_commandParams.add(
         addWiFiNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_addWiFiNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_addWiFiNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_addWiFiNetwork_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_addWiFiNetwork_commandParams.put(
+        "ssid", networkCommissioning_addWiFiNetwork_ssid_commandParameter);
+
+    CommandParameter networkCommissioning_addWiFiNetwork_credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    networkCommissioning_addWiFiNetwork_commandParams.put(
+        "credentials", networkCommissioning_addWiFiNetwork_credentials_commandParameter);
+
+    CommandParameter networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_addWiFiNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_addWiFiNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_addWiFiNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .addWiFiNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("ssid"),
+                      (byte[]) commandArguments.get("credentials"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_addWiFiNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "addWiFiNetwork", networkCommissioning_addWiFiNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_disableNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9909,17 +14355,51 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_disableNetwork_commandParams.add(
         disableNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_disableNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_disableNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_disableNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_disableNetwork_commandParams.put(
+        "networkID", networkCommissioning_disableNetwork_networkID_commandParameter);
+
+    CommandParameter networkCommissioning_disableNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_disableNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_disableNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_disableNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_disableNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_disableNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_disableNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .disableNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_disableNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "disableNetwork", networkCommissioning_disableNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_enableNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9934,17 +14414,51 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter enableNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_enableNetwork_commandParams.add(enableNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_enableNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_enableNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_enableNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_enableNetwork_commandParams.put(
+        "networkID", networkCommissioning_enableNetwork_networkID_commandParameter);
+
+    CommandParameter networkCommissioning_enableNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_enableNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_enableNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_enableNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_enableNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_enableNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_enableNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .enableNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_enableNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "enableNetwork", networkCommissioning_enableNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -9953,18 +14467,39 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_getLastNetworkCommissioningResult_commandParams.add(
         getLastNetworkCommissioningResult_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter>
+        networkCommissioning_getLastNetworkCommissioningResult_commandParams =
+            new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_getLastNetworkCommissioningResult_commandParameter =
+        new CommandParameter("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter =
+            new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_getLastNetworkCommissioningResult_commandParams.put(
+        "timeoutMs",
+        networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_getLastNetworkCommissioningResult_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .getLastNetworkCommissioningResult(
+                      (DefaultClusterCallback) callback, (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_getLastNetworkCommissioningResult_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "getLastNetworkCommissioningResult",
         networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_removeNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -9979,17 +14514,51 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter removeNetwork_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_removeNetwork_commandParams.add(removeNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_removeNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_removeNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_removeNetwork_networkID_commandParameter =
+        new CommandParameter("networkID", byte[].class);
+    networkCommissioning_removeNetwork_commandParams.put(
+        "networkID", networkCommissioning_removeNetwork_networkID_commandParameter);
+
+    CommandParameter networkCommissioning_removeNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_removeNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_removeNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_removeNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_removeNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_removeNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_removeNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .removeNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("networkID"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_removeNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "removeNetwork", networkCommissioning_removeNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_scanNetworks_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10004,17 +14573,51 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter scanNetworks_timeoutMs_commandParameter =
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_scanNetworks_commandParams.add(scanNetworks_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_scanNetworks_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_scanNetworks_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
+    CommandParameter networkCommissioning_scanNetworks_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_scanNetworks_commandParams.put(
+        "ssid", networkCommissioning_scanNetworks_ssid_commandParameter);
+
+    CommandParameter networkCommissioning_scanNetworks_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_scanNetworks_commandParams.put(
+        "breadcrumb", networkCommissioning_scanNetworks_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_scanNetworks_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_scanNetworks_commandParams.put(
+        "timeoutMs", networkCommissioning_scanNetworks_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_scanNetworks_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .scanNetworks(
+                      (ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("ssid"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_scanNetworks_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "scanNetworks", networkCommissioning_scanNetworks_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10033,17 +14636,52 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_updateThreadNetwork_commandParams.add(
         updateThreadNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_updateThreadNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter =
+        new CommandParameter("operationalDataset", byte[].class);
+    networkCommissioning_updateThreadNetwork_commandParams.put(
+        "operationalDataset",
+        networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter);
+
+    CommandParameter networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_updateThreadNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_updateThreadNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_updateThreadNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .updateThreadNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("operationalDataset"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_updateThreadNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
         "updateThreadNetwork", networkCommissioning_updateThreadNetwork_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10066,12 +14704,51 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("timeoutMs", long.class);
     networkCommissioning_updateWiFiNetwork_commandParams.add(
         updateWiFiNetwork_timeoutMs_commandParameter);
+=======
+    Map<String, CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter networkCommissioning_updateWiFiNetwork_commandParameter =
+        new CommandParameter(
+            "NetworkCommissioning",
+            ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
+    CommandParameter networkCommissioning_updateWiFiNetwork_ssid_commandParameter =
+        new CommandParameter("ssid", byte[].class);
+    networkCommissioning_updateWiFiNetwork_commandParams.put(
+        "ssid", networkCommissioning_updateWiFiNetwork_ssid_commandParameter);
+
+    CommandParameter networkCommissioning_updateWiFiNetwork_credentials_commandParameter =
+        new CommandParameter("credentials", byte[].class);
+    networkCommissioning_updateWiFiNetwork_commandParams.put(
+        "credentials", networkCommissioning_updateWiFiNetwork_credentials_commandParameter);
+
+    CommandParameter networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter =
+        new CommandParameter("breadcrumb", long.class);
+    networkCommissioning_updateWiFiNetwork_commandParams.put(
+        "breadcrumb", networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter);
+
+    CommandParameter networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter =
+        new CommandParameter("timeoutMs", long.class);
+    networkCommissioning_updateWiFiNetwork_commandParams.put(
+        "timeoutMs", networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo networkCommissioning_updateWiFiNetwork_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.NetworkCommissioningCluster) cluster)
+                  .updateWiFiNetwork(
+                      (ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("ssid"),
+                      (byte[]) commandArguments.get("credentials"),
+                      (Long) commandArguments.get("breadcrumb"),
+                      (Long) commandArguments.get("timeoutMs"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_updateWiFiNetwork_commandParams);
@@ -10084,6 +14761,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             networkCommissioning_ClusterCommandInfo);
     clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
     Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10097,17 +14775,46 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("newVersion", long.class);
     otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.add(
         applyUpdateRequest_newVersion_commandParameter);
+=======
+    Map<String, CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_commandParameter =
+        new CommandParameter(
+            "OtaSoftwareUpdateProvider",
+            ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
+    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put(
+        "updateToken", otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter =
+        new CommandParameter("newVersion", long.class);
+    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put(
+        "newVersion", otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .applyUpdateRequest(
+                      (ChipClusters.OtaSoftwareUpdateProviderCluster
+                              .ApplyUpdateRequestResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("updateToken"),
+                      (Long) commandArguments.get("newVersion"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateProvider_applyUpdateRequest_commandParams);
     otaSoftwareUpdateProvider_ClusterCommandInfo.put(
         "applyUpdateRequest", otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10121,17 +14828,45 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("softwareVersion", long.class);
     otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.add(
         notifyUpdateApplied_softwareVersion_commandParameter);
+=======
+    Map<String, CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_commandParameter =
+        new CommandParameter(
+            "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter =
+        new CommandParameter("updateToken", byte[].class);
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put(
+        "updateToken", otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter);
+
+    CommandParameter
+        otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter =
+            new CommandParameter("softwareVersion", long.class);
+    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put(
+        "softwareVersion",
+        otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .notifyUpdateApplied(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("updateToken"),
+                      (Long) commandArguments.get("softwareVersion"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams);
     otaSoftwareUpdateProvider_ClusterCommandInfo.put(
         "notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10171,12 +14906,78 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("metadataForProvider", byte[].class);
     otaSoftwareUpdateProvider_queryImage_commandParams.add(
         queryImage_metadataForProvider_commandParameter);
+=======
+    Map<String, CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter otaSoftwareUpdateProvider_queryImage_commandParameter =
+        new CommandParameter(
+            "OtaSoftwareUpdateProvider",
+            ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
+    CommandParameter otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter =
+        new CommandParameter("vendorId", int.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "vendorId", otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_productId_commandParameter =
+        new CommandParameter("productId", int.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "productId", otaSoftwareUpdateProvider_queryImage_productId_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter =
+        new CommandParameter("hardwareVersion", int.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "hardwareVersion", otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "softwareVersion", otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter =
+        new CommandParameter("protocolsSupported", int.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "protocolsSupported",
+        otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_location_commandParameter =
+        new CommandParameter("location", String.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "location", otaSoftwareUpdateProvider_queryImage_location_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter =
+        new CommandParameter("requestorCanConsent", boolean.class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "requestorCanConsent",
+        otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter);
+
+    CommandParameter otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter =
+        new CommandParameter("metadataForProvider", byte[].class);
+    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+        "metadataForProvider",
+        otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProvider_queryImage_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
+                  .queryImage(
+                      (ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("vendorId"),
+                      (Integer) commandArguments.get("productId"),
+                      (Integer) commandArguments.get("hardwareVersion"),
+                      (Long) commandArguments.get("softwareVersion"),
+                      (Integer) commandArguments.get("protocolsSupported"),
+                      (String) commandArguments.get("location"),
+                      (Boolean) commandArguments.get("requestorCanConsent"),
+                      (byte[]) commandArguments.get("metadataForProvider"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateProvider_queryImage_commandParams);
@@ -10189,6 +14990,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             otaSoftwareUpdateProvider_ClusterCommandInfo);
     clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
     Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10212,12 +15014,55 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("metadataForNode", byte[].class);
     otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
         announceOtaProvider_metadataForNode_commandParameter);
+=======
+    Map<String, CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_commandParameter =
+        new CommandParameter(
+            "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter =
+            new CommandParameter("providerLocation", byte[].class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+        "providerLocation",
+        otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter);
+
+    CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter =
+        new CommandParameter("vendorId", int.class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+        "vendorId", otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter);
+
+    CommandParameter
+        otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter =
+            new CommandParameter("announcementReason", int.class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+        "announcementReason",
+        otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter);
+
+    CommandParameter
+        otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter =
+            new CommandParameter("metadataForNode", byte[].class);
+    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+        "metadataForNode",
+        otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
+                  .announceOtaProvider(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("providerLocation"),
+                      (Integer) commandArguments.get("vendorId"),
+                      (Integer) commandArguments.get("announcementReason"),
+                      (byte[]) commandArguments.get("metadataForNode"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateRequestor_announceOtaProvider_commandParams);
@@ -10238,18 +15083,30 @@ public Map<String, ClusterInfo> getClusterMap() {
             occupancySensing_ClusterCommandInfo);
     clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
     Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> onOff_off_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> onOff_off_commandParams = new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_off_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo onOff_off_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster).off((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_off_commandParams);
     onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> onOff_offWithEffect_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10260,41 +15117,90 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter offWithEffect_effectVariant_commandParameter =
         new CommandParameter("effectVariant", int.class);
     onOff_offWithEffect_commandParams.add(offWithEffect_effectVariant_commandParameter);
+=======
+    Map<String, CommandParameter> onOff_offWithEffect_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_offWithEffect_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter onOff_offWithEffect_effectId_commandParameter =
+        new CommandParameter("effectId", int.class);
+    onOff_offWithEffect_commandParams.put(
+        "effectId", onOff_offWithEffect_effectId_commandParameter);
+
+    CommandParameter onOff_offWithEffect_effectVariant_commandParameter =
+        new CommandParameter("effectVariant", int.class);
+    onOff_offWithEffect_commandParams.put(
+        "effectVariant", onOff_offWithEffect_effectVariant_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo onOff_offWithEffect_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster)
+                  .offWithEffect(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("effectId"),
+                      (Integer) commandArguments.get("effectVariant"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_offWithEffect_commandParams);
     onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> onOff_on_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_on_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo onOff_on_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster).on((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_on_commandParams);
     onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> onOff_onWithRecallGlobalScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> onOff_onWithRecallGlobalScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_onWithRecallGlobalScene_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo onOff_onWithRecallGlobalScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster)
+                  .onWithRecallGlobalScene((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_onWithRecallGlobalScene_commandParams);
     onOff_ClusterCommandInfo.put(
         "onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> onOff_onWithTimedOff_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10309,24 +15215,65 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter onWithTimedOff_offWaitTime_commandParameter =
         new CommandParameter("offWaitTime", int.class);
     onOff_onWithTimedOff_commandParams.add(onWithTimedOff_offWaitTime_commandParameter);
+=======
+    Map<String, CommandParameter> onOff_onWithTimedOff_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_onWithTimedOff_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter onOff_onWithTimedOff_onOffControl_commandParameter =
+        new CommandParameter("onOffControl", int.class);
+    onOff_onWithTimedOff_commandParams.put(
+        "onOffControl", onOff_onWithTimedOff_onOffControl_commandParameter);
+
+    CommandParameter onOff_onWithTimedOff_onTime_commandParameter =
+        new CommandParameter("onTime", int.class);
+    onOff_onWithTimedOff_commandParams.put("onTime", onOff_onWithTimedOff_onTime_commandParameter);
+
+    CommandParameter onOff_onWithTimedOff_offWaitTime_commandParameter =
+        new CommandParameter("offWaitTime", int.class);
+    onOff_onWithTimedOff_commandParams.put(
+        "offWaitTime", onOff_onWithTimedOff_offWaitTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo onOff_onWithTimedOff_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster)
+                  .onWithTimedOff(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("onOffControl"),
+                      (Integer) commandArguments.get("onTime"),
+                      (Integer) commandArguments.get("offWaitTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_onWithTimedOff_commandParams);
     onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> onOff_toggle_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> onOff_toggle_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter onOff_toggle_commandParameter =
+        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo onOff_toggle_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OnOffCluster) cluster).toggle((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOff_toggle_commandParams);
@@ -10345,6 +15292,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             onOffSwitchConfiguration_ClusterCommandInfo);
     clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
     Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_addNOC_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10367,17 +15315,62 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter addNOC_adminVendorId_commandParameter =
         new CommandParameter("adminVendorId", int.class);
     operationalCredentials_addNOC_commandParams.add(addNOC_adminVendorId_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_addNOC_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_addNOC_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+    CommandParameter operationalCredentials_addNOC_NOCValue_commandParameter =
+        new CommandParameter("NOCValue", byte[].class);
+    operationalCredentials_addNOC_commandParams.put(
+        "NOCValue", operationalCredentials_addNOC_NOCValue_commandParameter);
+
+    CommandParameter operationalCredentials_addNOC_ICACValue_commandParameter =
+        new CommandParameter("ICACValue", byte[].class);
+    operationalCredentials_addNOC_commandParams.put(
+        "ICACValue", operationalCredentials_addNOC_ICACValue_commandParameter);
+
+    CommandParameter operationalCredentials_addNOC_IPKValue_commandParameter =
+        new CommandParameter("IPKValue", byte[].class);
+    operationalCredentials_addNOC_commandParams.put(
+        "IPKValue", operationalCredentials_addNOC_IPKValue_commandParameter);
+
+    CommandParameter operationalCredentials_addNOC_caseAdminNode_commandParameter =
+        new CommandParameter("caseAdminNode", long.class);
+    operationalCredentials_addNOC_commandParams.put(
+        "caseAdminNode", operationalCredentials_addNOC_caseAdminNode_commandParameter);
+
+    CommandParameter operationalCredentials_addNOC_adminVendorId_commandParameter =
+        new CommandParameter("adminVendorId", int.class);
+    operationalCredentials_addNOC_commandParams.put(
+        "adminVendorId", operationalCredentials_addNOC_adminVendorId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_addNOC_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .addNOC(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (byte[]) commandArguments.get("NOCValue"),
+                      (byte[]) commandArguments.get("ICACValue"),
+                      (byte[]) commandArguments.get("IPKValue"),
+                      (Long) commandArguments.get("caseAdminNode"),
+                      (Integer) commandArguments.get("adminVendorId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_addNOC_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "addNOC", operationalCredentials_addNOC_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10386,17 +15379,38 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("rootCertificate", byte[].class);
     operationalCredentials_addTrustedRootCertificate_commandParams.add(
         addTrustedRootCertificate_rootCertificate_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_addTrustedRootCertificate_commandParameter =
+        new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter =
+            new CommandParameter("rootCertificate", byte[].class);
+    operationalCredentials_addTrustedRootCertificate_commandParams.put(
+        "rootCertificate",
+        operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_addTrustedRootCertificate_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .addTrustedRootCertificate(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("rootCertificate"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_addTrustedRootCertificate_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_attestationRequest_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10405,17 +15419,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("attestationNonce", byte[].class);
     operationalCredentials_attestationRequest_commandParams.add(
         attestationRequest_attestationNonce_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_attestationRequest_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_attestationRequest_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
+    CommandParameter operationalCredentials_attestationRequest_attestationNonce_commandParameter =
+        new CommandParameter("attestationNonce", byte[].class);
+    operationalCredentials_attestationRequest_commandParams.put(
+        "attestationNonce",
+        operationalCredentials_attestationRequest_attestationNonce_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_attestationRequest_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .attestationRequest(
+                      (ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback)
+                          callback,
+                      (byte[]) commandArguments.get("attestationNonce"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_attestationRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "attestationRequest", operationalCredentials_attestationRequest_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10424,34 +15461,79 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("certificateType", int.class);
     operationalCredentials_certificateChainRequest_commandParams.add(
         certificateChainRequest_certificateType_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_certificateChainRequest_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
+    CommandParameter
+        operationalCredentials_certificateChainRequest_certificateType_commandParameter =
+            new CommandParameter("certificateType", int.class);
+    operationalCredentials_certificateChainRequest_commandParams.put(
+        "certificateType",
+        operationalCredentials_certificateChainRequest_certificateType_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_certificateChainRequest_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .certificateChainRequest(
+                      (ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("certificateType"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_certificateChainRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "certificateChainRequest", operationalCredentials_certificateChainRequest_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_opCSRRequest_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter opCSRRequest_CSRNonce_commandParameter =
         new CommandParameter("CSRNonce", byte[].class);
     operationalCredentials_opCSRRequest_commandParams.add(opCSRRequest_CSRNonce_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_opCSRRequest_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_opCSRRequest_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
+    CommandParameter operationalCredentials_opCSRRequest_CSRNonce_commandParameter =
+        new CommandParameter("CSRNonce", byte[].class);
+    operationalCredentials_opCSRRequest_commandParams.put(
+        "CSRNonce", operationalCredentials_opCSRRequest_CSRNonce_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_opCSRRequest_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .opCSRRequest(
+                      (ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback) callback,
+                      (byte[]) commandArguments.get("CSRNonce"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_opCSRRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "opCSRRequest", operationalCredentials_opCSRRequest_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_removeFabric_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10459,17 +15541,38 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("fabricIndex", int.class);
     operationalCredentials_removeFabric_commandParams.add(
         removeFabric_fabricIndex_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_removeFabric_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_removeFabric_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+    CommandParameter operationalCredentials_removeFabric_fabricIndex_commandParameter =
+        new CommandParameter("fabricIndex", int.class);
+    operationalCredentials_removeFabric_commandParams.put(
+        "fabricIndex", operationalCredentials_removeFabric_fabricIndex_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_removeFabric_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .removeFabric(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (Integer) commandArguments.get("fabricIndex"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_removeFabric_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "removeFabric", operationalCredentials_removeFabric_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_removeTrustedRootCertificate_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10478,18 +15581,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("trustedRootIdentifier", byte[].class);
     operationalCredentials_removeTrustedRootCertificate_commandParams.add(
         removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
+=======
+    Map<String, CommandParameter>
+        operationalCredentials_removeTrustedRootCertificate_commandParams =
+            new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_removeTrustedRootCertificate_commandParameter =
+        new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter
+        operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter =
+            new CommandParameter("trustedRootIdentifier", byte[].class);
+    operationalCredentials_removeTrustedRootCertificate_commandParams.put(
+        "trustedRootIdentifier",
+        operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_removeTrustedRootCertificate_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .removeTrustedRootCertificate(
+                      (DefaultClusterCallback) callback,
+                      (byte[]) commandArguments.get("trustedRootIdentifier"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_removeTrustedRootCertificate_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "removeTrustedRootCertificate",
         operationalCredentials_removeTrustedRootCertificate_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
         new ArrayList<>();
     // TODO: fill out parameter types
@@ -10498,17 +15623,38 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("label", String.class);
     operationalCredentials_updateFabricLabel_commandParams.add(
         updateFabricLabel_label_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_updateFabricLabel_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+    CommandParameter operationalCredentials_updateFabricLabel_label_commandParameter =
+        new CommandParameter("label", String.class);
+    operationalCredentials_updateFabricLabel_commandParams.put(
+        "label", operationalCredentials_updateFabricLabel_label_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_updateFabricLabel_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .updateFabricLabel(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (String) commandArguments.get("label"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_updateFabricLabel_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "updateFabricLabel", operationalCredentials_updateFabricLabel_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> operationalCredentials_updateNOC_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10519,12 +15665,38 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter updateNOC_ICACValue_commandParameter =
         new CommandParameter("ICACValue", byte[].class);
     operationalCredentials_updateNOC_commandParams.add(updateNOC_ICACValue_commandParameter);
+=======
+    Map<String, CommandParameter> operationalCredentials_updateNOC_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter operationalCredentials_updateNOC_commandParameter =
+        new CommandParameter(
+            "OperationalCredentials",
+            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+    CommandParameter operationalCredentials_updateNOC_NOCValue_commandParameter =
+        new CommandParameter("NOCValue", byte[].class);
+    operationalCredentials_updateNOC_commandParams.put(
+        "NOCValue", operationalCredentials_updateNOC_NOCValue_commandParameter);
+
+    CommandParameter operationalCredentials_updateNOC_ICACValue_commandParameter =
+        new CommandParameter("ICACValue", byte[].class);
+    operationalCredentials_updateNOC_commandParams.put(
+        "ICACValue", operationalCredentials_updateNOC_ICACValue_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo operationalCredentials_updateNOC_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.OperationalCredentialsCluster) cluster)
+                  .updateNOC(
+                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
+                      (byte[]) commandArguments.get("NOCValue"),
+                      (byte[]) commandArguments.get("ICACValue"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_updateNOC_commandParams);
@@ -10567,6 +15739,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             relativeHumidityMeasurement_ClusterCommandInfo);
     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
     Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> scenes_addScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10593,32 +15766,101 @@ public Map<String, ClusterInfo> getClusterMap() {
 
     CommandParameter addScene_value_commandParameter = new CommandParameter("value", int.class);
     scenes_addScene_commandParams.add(addScene_value_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_addScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_addScene_commandParameter =
+        new CommandParameter("Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
+    CommandParameter scenes_addScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_addScene_commandParams.put("groupId", scenes_addScene_groupId_commandParameter);
+
+    CommandParameter scenes_addScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_addScene_commandParams.put("sceneId", scenes_addScene_sceneId_commandParameter);
+
+    CommandParameter scenes_addScene_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    scenes_addScene_commandParams.put(
+        "transitionTime", scenes_addScene_transitionTime_commandParameter);
+
+    CommandParameter scenes_addScene_sceneName_commandParameter =
+        new CommandParameter("sceneName", String.class);
+    scenes_addScene_commandParams.put("sceneName", scenes_addScene_sceneName_commandParameter);
+
+    CommandParameter scenes_addScene_clusterId_commandParameter =
+        new CommandParameter("clusterId", long.class);
+    scenes_addScene_commandParams.put("clusterId", scenes_addScene_clusterId_commandParameter);
+
+    CommandParameter scenes_addScene_length_commandParameter =
+        new CommandParameter("length", int.class);
+    scenes_addScene_commandParams.put("length", scenes_addScene_length_commandParameter);
+
+    CommandParameter scenes_addScene_value_commandParameter =
+        new CommandParameter("value", int.class);
+    scenes_addScene_commandParams.put("value", scenes_addScene_value_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_addScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .addScene(
+                      (ChipClusters.ScenesCluster.AddSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"),
+                      (Integer) commandArguments.get("transitionTime"),
+                      (String) commandArguments.get("sceneName"),
+                      (Long) commandArguments.get("clusterId"),
+                      (Integer) commandArguments.get("length"),
+                      (Integer) commandArguments.get("value"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_addScene_commandParams);
     scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_getSceneMembership_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter getSceneMembership_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
     scenes_getSceneMembership_commandParams.add(getSceneMembership_groupId_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_getSceneMembership_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_getSceneMembership_commandParameter =
+        new CommandParameter(
+            "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
+    CommandParameter scenes_getSceneMembership_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_getSceneMembership_commandParams.put(
+        "groupId", scenes_getSceneMembership_groupId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_getSceneMembership_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .getSceneMembership(
+                      (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_getSceneMembership_commandParams);
     scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_recallScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10633,32 +15875,81 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter recallScene_transitionTime_commandParameter =
         new CommandParameter("transitionTime", int.class);
     scenes_recallScene_commandParams.add(recallScene_transitionTime_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_recallScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_recallScene_commandParameter =
+        new CommandParameter("Scenes", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter scenes_recallScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_recallScene_commandParams.put("groupId", scenes_recallScene_groupId_commandParameter);
+
+    CommandParameter scenes_recallScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_recallScene_commandParams.put("sceneId", scenes_recallScene_sceneId_commandParameter);
+
+    CommandParameter scenes_recallScene_transitionTime_commandParameter =
+        new CommandParameter("transitionTime", int.class);
+    scenes_recallScene_commandParams.put(
+        "transitionTime", scenes_recallScene_transitionTime_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_recallScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .recallScene(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"),
+                      (Integer) commandArguments.get("transitionTime"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_recallScene_commandParams);
     scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_removeAllScenes_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter removeAllScenes_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
     scenes_removeAllScenes_commandParams.add(removeAllScenes_groupId_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_removeAllScenes_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_removeAllScenes_commandParameter =
+        new CommandParameter(
+            "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
+    CommandParameter scenes_removeAllScenes_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_removeAllScenes_commandParams.put(
+        "groupId", scenes_removeAllScenes_groupId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_removeAllScenes_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .removeAllScenes(
+                      (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_removeAllScenes_commandParams);
     scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_removeScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10669,16 +15960,40 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter removeScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
     scenes_removeScene_commandParams.add(removeScene_sceneId_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_removeScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_removeScene_commandParameter =
+        new CommandParameter(
+            "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
+    CommandParameter scenes_removeScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_removeScene_commandParams.put("groupId", scenes_removeScene_groupId_commandParameter);
+
+    CommandParameter scenes_removeScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_removeScene_commandParams.put("sceneId", scenes_removeScene_sceneId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_removeScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .removeScene(
+                      (ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_removeScene_commandParams);
     scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_storeScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10689,32 +16004,77 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter storeScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
     scenes_storeScene_commandParams.add(storeScene_sceneId_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_storeScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_storeScene_commandParameter =
+        new CommandParameter("Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
+    CommandParameter scenes_storeScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_storeScene_commandParams.put("groupId", scenes_storeScene_groupId_commandParameter);
+
+    CommandParameter scenes_storeScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_storeScene_commandParams.put("sceneId", scenes_storeScene_sceneId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_storeScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .storeScene(
+                      (ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_storeScene_commandParams);
     scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> scenes_viewScene_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter viewScene_groupId_commandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_viewScene_commandParams.add(viewScene_groupId_commandParameter);
+    scenes_viewScene_commandParams.add(viewScene_groupId_commandParameter);
+
+    CommandParameter viewScene_sceneId_commandParameter =
+        new CommandParameter("sceneId", int.class);
+    scenes_viewScene_commandParams.add(viewScene_sceneId_commandParameter);
+=======
+    Map<String, CommandParameter> scenes_viewScene_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter scenes_viewScene_commandParameter =
+        new CommandParameter("Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
+    CommandParameter scenes_viewScene_groupId_commandParameter =
+        new CommandParameter("groupId", int.class);
+    scenes_viewScene_commandParams.put("groupId", scenes_viewScene_groupId_commandParameter);
 
-    CommandParameter viewScene_sceneId_commandParameter =
+    CommandParameter scenes_viewScene_sceneId_commandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_viewScene_commandParams.add(viewScene_sceneId_commandParameter);
+    scenes_viewScene_commandParams.put("sceneId", scenes_viewScene_sceneId_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo scenes_viewScene_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ScenesCluster) cluster)
+                  .viewScene(
+                      (ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback,
+                      (Integer) commandArguments.get("groupId"),
+                      (Integer) commandArguments.get("sceneId"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             scenes_viewScene_commandParams);
@@ -10726,14 +16086,27 @@ public Map<String, ClusterInfo> getClusterMap() {
             scenes_ClusterCommandInfo);
     clusterMap.put("scenes", scenes_clusterInfo);
     Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> softwareDiagnostics_resetWatermarks_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> softwareDiagnostics_resetWatermarks_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter softwareDiagnostics_resetWatermarks_commandParameter =
+        new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo softwareDiagnostics_resetWatermarks_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
+                  .resetWatermarks((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             softwareDiagnostics_resetWatermarks_commandParams);
@@ -10753,22 +16126,43 @@ public Map<String, ClusterInfo> getClusterMap() {
             switch_ClusterCommandInfo);
     clusterMap.put("switch", switch_clusterInfo);
     Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> tvChannel_changeChannel_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter changeChannel_match_commandParameter =
         new CommandParameter("match", String.class);
     tvChannel_changeChannel_commandParams.add(changeChannel_match_commandParameter);
+=======
+    Map<String, CommandParameter> tvChannel_changeChannel_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter tvChannel_changeChannel_commandParameter =
+        new CommandParameter(
+            "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
+    CommandParameter tvChannel_changeChannel_match_commandParameter =
+        new CommandParameter("match", String.class);
+    tvChannel_changeChannel_commandParams.put(
+        "match", tvChannel_changeChannel_match_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo tvChannel_changeChannel_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TvChannelCluster) cluster)
+                  .changeChannel(
+                      (ChipClusters.TvChannelCluster.ChangeChannelResponseCallback) callback,
+                      (String) commandArguments.get("match"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             tvChannel_changeChannel_commandParams);
     tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> tvChannel_changeChannelByNumber_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10781,28 +16175,69 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("minorNumber", int.class);
     tvChannel_changeChannelByNumber_commandParams.add(
         changeChannelByNumber_minorNumber_commandParameter);
+=======
+    Map<String, CommandParameter> tvChannel_changeChannelByNumber_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter tvChannel_changeChannelByNumber_commandParameter =
+        new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter tvChannel_changeChannelByNumber_majorNumber_commandParameter =
+        new CommandParameter("majorNumber", int.class);
+    tvChannel_changeChannelByNumber_commandParams.put(
+        "majorNumber", tvChannel_changeChannelByNumber_majorNumber_commandParameter);
+
+    CommandParameter tvChannel_changeChannelByNumber_minorNumber_commandParameter =
+        new CommandParameter("minorNumber", int.class);
+    tvChannel_changeChannelByNumber_commandParams.put(
+        "minorNumber", tvChannel_changeChannelByNumber_minorNumber_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo tvChannel_changeChannelByNumber_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TvChannelCluster) cluster)
+                  .changeChannelByNumber(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("majorNumber"),
+                      (Integer) commandArguments.get("minorNumber"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             tvChannel_changeChannelByNumber_commandParams);
     tvChannel_ClusterCommandInfo.put(
         "changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> tvChannel_skipChannel_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter skipChannel_count_commandParameter = new CommandParameter("count", int.class);
     tvChannel_skipChannel_commandParams.add(skipChannel_count_commandParameter);
+=======
+    Map<String, CommandParameter> tvChannel_skipChannel_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter tvChannel_skipChannel_commandParameter =
+        new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter tvChannel_skipChannel_count_commandParameter =
+        new CommandParameter("count", int.class);
+    tvChannel_skipChannel_commandParams.put("count", tvChannel_skipChannel_count_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo tvChannel_skipChannel_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TvChannelCluster) cluster)
+                  .skipChannel(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("count"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             tvChannel_skipChannel_commandParams);
@@ -10814,6 +16249,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             tvChannel_ClusterCommandInfo);
     clusterMap.put("tvChannel", tvChannel_clusterInfo);
     Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> targetNavigator_navigateTarget_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10824,12 +16260,38 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter navigateTarget_data_commandParameter =
         new CommandParameter("data", String.class);
     targetNavigator_navigateTarget_commandParams.add(navigateTarget_data_commandParameter);
+=======
+    Map<String, CommandParameter> targetNavigator_navigateTarget_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter targetNavigator_navigateTarget_commandParameter =
+        new CommandParameter(
+            "TargetNavigator",
+            ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
+    CommandParameter targetNavigator_navigateTarget_target_commandParameter =
+        new CommandParameter("target", int.class);
+    targetNavigator_navigateTarget_commandParams.put(
+        "target", targetNavigator_navigateTarget_target_commandParameter);
+
+    CommandParameter targetNavigator_navigateTarget_data_commandParameter =
+        new CommandParameter("data", String.class);
+    targetNavigator_navigateTarget_commandParams.put(
+        "data", targetNavigator_navigateTarget_data_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo targetNavigator_navigateTarget_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TargetNavigatorCluster) cluster)
+                  .navigateTarget(
+                      (ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback,
+                      (Integer) commandArguments.get("target"),
+                      (String) commandArguments.get("data"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             targetNavigator_navigateTarget_commandParams);
@@ -10849,18 +16311,31 @@ public Map<String, ClusterInfo> getClusterMap() {
             temperatureMeasurement_ClusterCommandInfo);
     clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
     Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> testCluster_test_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> testCluster_test_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testCluster_test_commandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo testCluster_test_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TestClusterCluster) cluster).test((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_test_commandParams);
     testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> testCluster_testAddArguments_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10871,49 +16346,115 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter testAddArguments_arg2_commandParameter =
         new CommandParameter("arg2", int.class);
     testCluster_testAddArguments_commandParams.add(testAddArguments_arg2_commandParameter);
+=======
+    Map<String, CommandParameter> testCluster_testAddArguments_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testCluster_testAddArguments_commandParameter =
+        new CommandParameter(
+            "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
+    CommandParameter testCluster_testAddArguments_arg1_commandParameter =
+        new CommandParameter("arg1", int.class);
+    testCluster_testAddArguments_commandParams.put(
+        "arg1", testCluster_testAddArguments_arg1_commandParameter);
+
+    CommandParameter testCluster_testAddArguments_arg2_commandParameter =
+        new CommandParameter("arg2", int.class);
+    testCluster_testAddArguments_commandParams.put(
+        "arg2", testCluster_testAddArguments_arg2_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo testCluster_testAddArguments_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testAddArguments(
+                      (ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback,
+                      (Integer) commandArguments.get("arg1"),
+                      (Integer) commandArguments.get("arg2"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testAddArguments_commandParams);
     testCluster_ClusterCommandInfo.put(
         "testAddArguments", testCluster_testAddArguments_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> testCluster_testNotHandled_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> testCluster_testNotHandled_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testCluster_testNotHandled_commandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo testCluster_testNotHandled_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testNotHandled((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testNotHandled_commandParams);
     testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> testCluster_testSpecific_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> testCluster_testSpecific_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testCluster_testSpecific_commandParameter =
+        new CommandParameter(
+            "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo testCluster_testSpecific_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testSpecific(
+                      (ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testSpecific_commandParams);
     testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> testCluster_testUnknownCommand_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> testCluster_testUnknownCommand_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testCluster_testUnknownCommand_commandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo testCluster_testUnknownCommand_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testUnknownCommand((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testUnknownCommand_commandParams);
@@ -10926,32 +16467,59 @@ public Map<String, ClusterInfo> getClusterMap() {
             testCluster_ClusterCommandInfo);
     clusterMap.put("testCluster", testCluster_clusterInfo);
     Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> thermostat_clearWeeklySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> thermostat_clearWeeklySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter thermostat_clearWeeklySchedule_commandParameter =
+        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo thermostat_clearWeeklySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .clearWeeklySchedule((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostat_clearWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> thermostat_getRelayStatusLog_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> thermostat_getRelayStatusLog_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter thermostat_getRelayStatusLog_commandParameter =
+        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo thermostat_getRelayStatusLog_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .getRelayStatusLog((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostat_getRelayStatusLog_commandParams);
     thermostat_ClusterCommandInfo.put(
         "getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> thermostat_getWeeklySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10962,17 +16530,42 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter getWeeklySchedule_modeToReturn_commandParameter =
         new CommandParameter("modeToReturn", int.class);
     thermostat_getWeeklySchedule_commandParams.add(getWeeklySchedule_modeToReturn_commandParameter);
+=======
+    Map<String, CommandParameter> thermostat_getWeeklySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter thermostat_getWeeklySchedule_commandParameter =
+        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter thermostat_getWeeklySchedule_daysToReturn_commandParameter =
+        new CommandParameter("daysToReturn", int.class);
+    thermostat_getWeeklySchedule_commandParams.put(
+        "daysToReturn", thermostat_getWeeklySchedule_daysToReturn_commandParameter);
+
+    CommandParameter thermostat_getWeeklySchedule_modeToReturn_commandParameter =
+        new CommandParameter("modeToReturn", int.class);
+    thermostat_getWeeklySchedule_commandParams.put(
+        "modeToReturn", thermostat_getWeeklySchedule_modeToReturn_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo thermostat_getWeeklySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .getWeeklySchedule(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("daysToReturn"),
+                      (Integer) commandArguments.get("modeToReturn"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostat_getWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> thermostat_setWeeklySchedule_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -10994,17 +16587,55 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter setWeeklySchedule_payload_commandParameter =
         new CommandParameter("payload", int.class);
     thermostat_setWeeklySchedule_commandParams.add(setWeeklySchedule_payload_commandParameter);
+=======
+    Map<String, CommandParameter> thermostat_setWeeklySchedule_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter thermostat_setWeeklySchedule_commandParameter =
+        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter =
+        new CommandParameter("numberOfTransitionsForSequence", int.class);
+    thermostat_setWeeklySchedule_commandParams.put(
+        "numberOfTransitionsForSequence",
+        thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
+
+    CommandParameter thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter =
+        new CommandParameter("dayOfWeekForSequence", int.class);
+    thermostat_setWeeklySchedule_commandParams.put(
+        "dayOfWeekForSequence", thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter);
+
+    CommandParameter thermostat_setWeeklySchedule_modeForSequence_commandParameter =
+        new CommandParameter("modeForSequence", int.class);
+    thermostat_setWeeklySchedule_commandParams.put(
+        "modeForSequence", thermostat_setWeeklySchedule_modeForSequence_commandParameter);
+
+    CommandParameter thermostat_setWeeklySchedule_payload_commandParameter =
+        new CommandParameter("payload", int.class);
+    thermostat_setWeeklySchedule_commandParams.put(
+        "payload", thermostat_setWeeklySchedule_payload_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo thermostat_setWeeklySchedule_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .setWeeklySchedule(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("numberOfTransitionsForSequence"),
+                      (Integer) commandArguments.get("dayOfWeekForSequence"),
+                      (Integer) commandArguments.get("modeForSequence"),
+                      (Integer) commandArguments.get("payload"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostat_setWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> thermostat_setpointRaiseLower_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -11015,12 +16646,36 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter setpointRaiseLower_amount_commandParameter =
         new CommandParameter("amount", int.class);
     thermostat_setpointRaiseLower_commandParams.add(setpointRaiseLower_amount_commandParameter);
+=======
+    Map<String, CommandParameter> thermostat_setpointRaiseLower_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter thermostat_setpointRaiseLower_commandParameter =
+        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter thermostat_setpointRaiseLower_mode_commandParameter =
+        new CommandParameter("mode", int.class);
+    thermostat_setpointRaiseLower_commandParams.put(
+        "mode", thermostat_setpointRaiseLower_mode_commandParameter);
+
+    CommandParameter thermostat_setpointRaiseLower_amount_commandParameter =
+        new CommandParameter("amount", int.class);
+    thermostat_setpointRaiseLower_commandParams.put(
+        "amount", thermostat_setpointRaiseLower_amount_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo thermostat_setpointRaiseLower_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThermostatCluster) cluster)
+                  .setpointRaiseLower(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("mode"),
+                      (Integer) commandArguments.get("amount"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostat_setpointRaiseLower_commandParams);
@@ -11043,14 +16698,27 @@ public Map<String, ClusterInfo> getClusterMap() {
     clusterMap.put(
         "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
     Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter threadNetworkDiagnostics_resetCounts_commandParameter =
+        new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo threadNetworkDiagnostics_resetCounts_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             threadNetworkDiagnostics_resetCounts_commandParams);
@@ -11070,14 +16738,27 @@ public Map<String, ClusterInfo> getClusterMap() {
             wakeOnLan_ClusterCommandInfo);
     clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
     Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter wiFiNetworkDiagnostics_resetCounts_commandParameter =
+        new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo wiFiNetworkDiagnostics_resetCounts_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
+                  .resetCounts((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             wiFiNetworkDiagnostics_resetCounts_commandParams);
@@ -11090,18 +16771,32 @@ public Map<String, ClusterInfo> getClusterMap() {
             wiFiNetworkDiagnostics_ClusterCommandInfo);
     clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
     Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_downOrClose_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> windowCovering_downOrClose_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_downOrClose_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo windowCovering_downOrClose_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .downOrClose((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_downOrClose_commandParams);
     windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_goToLiftPercentage_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -11114,34 +16809,80 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("liftPercent100thsValue", int.class);
     windowCovering_goToLiftPercentage_commandParams.add(
         goToLiftPercentage_liftPercent100thsValue_commandParameter);
+=======
+    Map<String, CommandParameter> windowCovering_goToLiftPercentage_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_goToLiftPercentage_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter =
+        new CommandParameter("liftPercentageValue", int.class);
+    windowCovering_goToLiftPercentage_commandParams.put(
+        "liftPercentageValue",
+        windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter);
+
+    CommandParameter windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter =
+        new CommandParameter("liftPercent100thsValue", int.class);
+    windowCovering_goToLiftPercentage_commandParams.put(
+        "liftPercent100thsValue",
+        windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo windowCovering_goToLiftPercentage_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToLiftPercentage(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("liftPercentageValue"),
+                      (Integer) commandArguments.get("liftPercent100thsValue"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_goToLiftPercentage_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_goToLiftValue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
     CommandParameter goToLiftValue_liftValue_commandParameter =
         new CommandParameter("liftValue", int.class);
     windowCovering_goToLiftValue_commandParams.add(goToLiftValue_liftValue_commandParameter);
+=======
+    Map<String, CommandParameter> windowCovering_goToLiftValue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_goToLiftValue_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter windowCovering_goToLiftValue_liftValue_commandParameter =
+        new CommandParameter("liftValue", int.class);
+    windowCovering_goToLiftValue_commandParams.put(
+        "liftValue", windowCovering_goToLiftValue_liftValue_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo windowCovering_goToLiftValue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToLiftValue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("liftValue"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_goToLiftValue_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_goToTiltPercentage_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -11154,17 +16895,44 @@ public Map<String, ClusterInfo> getClusterMap() {
         new CommandParameter("tiltPercent100thsValue", int.class);
     windowCovering_goToTiltPercentage_commandParams.add(
         goToTiltPercentage_tiltPercent100thsValue_commandParameter);
+=======
+    Map<String, CommandParameter> windowCovering_goToTiltPercentage_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_goToTiltPercentage_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter =
+        new CommandParameter("tiltPercentageValue", int.class);
+    windowCovering_goToTiltPercentage_commandParams.put(
+        "tiltPercentageValue",
+        windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter);
+
+    CommandParameter windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter =
+        new CommandParameter("tiltPercent100thsValue", int.class);
+    windowCovering_goToTiltPercentage_commandParams.put(
+        "tiltPercent100thsValue",
+        windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
+>>>>>>> 677ef48a5 (callback generation done)
 
     // Populate commands
     CommandInfo windowCovering_goToTiltPercentage_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToTiltPercentage(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("tiltPercentageValue"),
+                      (Integer) commandArguments.get("tiltPercent100thsValue"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_goToTiltPercentage_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_goToTiltValue_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
@@ -11192,36 +16960,81 @@ public Map<String, ClusterInfo> getClusterMap() {
     return clusterInfoMapping;
 >>>>>>> a4fd0282e (no error code generation)
 =======
+=======
+    Map<String, CommandParameter> windowCovering_goToTiltValue_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_goToTiltValue_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter windowCovering_goToTiltValue_tiltValue_commandParameter =
+        new CommandParameter("tiltValue", int.class);
+    windowCovering_goToTiltValue_commandParams.put(
+        "tiltValue", windowCovering_goToTiltValue_tiltValue_commandParameter);
+
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo windowCovering_goToTiltValue_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .goToTiltValue(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("tiltValue"));
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_goToTiltValue_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_stopMotion_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> windowCovering_stopMotion_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_stopMotion_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo windowCovering_stopMotion_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .stopMotion((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_stopMotion_commandParams);
     windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
+<<<<<<< HEAD
     List<CommandParameter> windowCovering_upOrOpen_commandParams = new ArrayList<>();
     // TODO: fill out parameter types
 
+=======
+    Map<String, CommandParameter> windowCovering_upOrOpen_commandParams =
+        new HashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter windowCovering_upOrOpen_commandParameter =
+        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
     CommandInfo windowCovering_upOrOpen_CommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
+<<<<<<< HEAD
               // TODO: expose index in template helper
+=======
+              ((ChipClusters.WindowCoveringCluster) cluster)
+                  .upOrOpen((DefaultClusterCallback) callback);
+>>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCovering_upOrOpen_commandParams);
@@ -11233,6 +17046,7 @@ >>>>>>> a4fd0282e (no error code generation)
             windowCovering_ClusterCommandInfo);
     clusterMap.put("windowCovering", windowCovering_clusterInfo);
     return clusterMap;
+<<<<<<< HEAD
 >>>>>>> 2d2bbd2e1 (new design solution)
 =======
  public Map<String, ClusterInfo> getClusterMap() {
@@ -14960,6 +20774,7 @@ public Map<String, ClusterInfo> getClusterMap() {
      clusterMap.put("windowCovering", windowCovering_clusterInfo);
      return clusterMap;
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+>>>>>>> 677ef48a5 (callback generation done)
   }
 }
-

From b75f47b7e68ff3ce153cd79dbdbca8e7b3f1f946 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 16:32:58 -0400
Subject: [PATCH 07/38] on/off commands working

---
 .../.idea/deploymentTargetDropDown.xml        |   17 +
 .../ClusterInteractionFragment.kt             |   58 +-
 .../java/src/chip/clusterinfo/outline.java    |    4 +-
 .../java/templates/ClusterInfo-java.zapt      |   34 +-
 .../devicecontroller/ClusterInfoMapping.java  | 4230 ++++++++++++-----
 5 files changed, 3069 insertions(+), 1274 deletions(-)
 create mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000000000..6d64cf9d63f3de
--- /dev/null
+++ b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="12171FDD4002GB" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-10-18T19:12:25.735665Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index a7fa9823bd90b5..f27ba82ede1002 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -1,11 +1,11 @@
 package com.google.chip.chiptool.clusterclient
 
-import android.app.AlertDialog
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.Toast
 import androidx.fragment.app.Fragment
 import chip.clusterinfo.ClusterCommandCallback
 import chip.clusterinfo.ClusterInfo
@@ -30,6 +30,8 @@ import
 >>>>>>> 505e97db3 (change package)
 =======
 import chip.devicecontroller.ClusterInfoMapping
+import java.lang.Exception
+import java.util.Objects
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 >>>>>>> a4fd0282e (no error code generation)
@@ -40,10 +42,14 @@ class ClusterInteractionFragment : Fragment() {
 
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
+<<<<<<< HEAD
 <<<<<<< HEAD
   private lateinit var clusterMap: Map<String, ClusterInfo>
 =======
 >>>>>>> a4fd0282e (no error code generation)
+=======
+  private lateinit var clusterMap: Map<String, ClusterInfo>
+>>>>>>> 41b0956c1 (on/off commands working)
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -54,6 +60,7 @@ class ClusterInteractionFragment : Fragment() {
       deviceController.setCompletionListener(ChipControllerCallback())
       addressUpdateFragment =
         childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
+<<<<<<< HEAD
 <<<<<<< HEAD
       clusterMap = ClusterInfoMapping().clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
@@ -104,6 +111,55 @@ class ClusterInteractionFragment : Fragment() {
     for ((key, value) in test.entries) {
       println("${key}=$value")
 >>>>>>> a4fd0282e (no error code generation)
+=======
+      val clusterMapping = ClusterInfoMapping()
+      clusterMap = clusterMapping.clusterMap;
+      getClusterMappingBtn.setOnClickListener { scope.launch {getClusterMapping()} }
+    }
+  }
+
+  private suspend fun getClusterMapping() {
+    // In real code: get the device ptr using ChipClient.getConnectedDevicePointer
+    showMessage("initialized")
+    // In real code: "OnOff" would be selected by the user.
+    val selectedClusterInfo = clusterMap["onOff"]
+    val devicePtr =
+      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
+    val endpointId = 1
+    val selectedCluster = selectedClusterInfo!!.createClusterFunction.create(devicePtr, endpointId)
+    // Imagine user wants to execute the command "OffWithEffect", pass the string here
+    val selectedCommandInfo: CommandInfo? = selectedClusterInfo!!.commands["on"]
+
+    var selectedCommandCallback =  selectedCommandInfo?.commandCallbackSupplier?.get()
+    selectedCommandCallback?.setCallbackDelegate(object : ClusterCommandCallback {
+      override fun onSuccess(responseValues: List<Any?>?) {
+        showMessage("command success")
+        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
+        for (responseValue in responseValues!!) {
+           Log.d("test", responseValue.toString());
+        }
+
+      }
+
+      override fun onFailure(exception: Exception?) {
+        showMessage("command failed")
+        Log.e(ClusterInteractionFragment.TAG, exception.toString())
+
+      }
+    })
+
+    var commandArguments: HashMap<String, Any> = HashMap<String, Any>()
+    for ((key, value) in selectedCommandInfo!!.commandParameters.entries) {
+      commandArguments.put(key, 123)
+    }
+    selectedCommandInfo.getCommandFunction().invokeCommand(selectedCluster, selectedCommandCallback, commandArguments)
+
+  }
+
+  private fun showMessage(msg: String) {
+    requireActivity().runOnUiThread {
+      Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+>>>>>>> 41b0956c1 (on/off commands working)
     }
   }
 
diff --git a/src/controller/java/src/chip/clusterinfo/outline.java b/src/controller/java/src/chip/clusterinfo/outline.java
index c8261542b017a3..c26d15c35cb074 100644
--- a/src/controller/java/src/chip/clusterinfo/outline.java
+++ b/src/controller/java/src/chip/clusterinfo/outline.java
@@ -170,9 +170,9 @@ public void onFailure(Exception exception) {
     offWithEffectInfo.getCommandParameters()
     List<Object> commandArguments = new ArrayList<>();
     // "effectId"
-    commandArguments.add(123);
+    commandArguments.add("effectId", 123);
     // "effectVariant"
-    commandArguments.add(456);
+    commandArguments.add("effectVariant", 456);
     // How do you know what callback to create?
     offWithEffectInfo.getCommandFunction().invokeCommand(onOffCluster, null, commandArguments);
   }
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 0050880f306393..2edf208a60735e 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -233,31 +233,31 @@ public class ClusterInfoMapping {
  public Map<String, ClusterInfo> getClusterMap() {
      Map<String, ClusterInfo> clusterMap = new HashMap<>();
      {{#chip_client_clusters}}
-     Map<String, CommandInfo> {{asLowerCamelCase name}}_ClusterCommandInfo = new HashMap<>();
+     Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfo = new LinkedHashMap<>();
      {{#chip_cluster_commands}}
-           Map<String, CommandParameter> {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams = new HashMap<String, CommandParameter>();
+           Map<String, CommandParameter> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameter>();
            // TODO: fill out parameter types
            {{#if (zcl_command_arguments_count this.id)}}
                {{#if hasSpecificResponse}}
-                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
                {{else}}
-                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
                {{#chip_cluster_command_arguments}}
-                 CommandParameter {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_commandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}_{{asLowerCamelCase ../name}}_{{asLowerCamelCase label}}_commandParameter);
+                 CommandParameter {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+                 {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter);
                  {{#not_last}} {{/not_last}}
                {{/chip_cluster_command_arguments}}
            {{else}}
                {{#if hasSpecificResponse}}
-                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
                {{else}}
-                 CommandParameter {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
            {{/if}}
            // Populate commands
            {{#if hasSpecificResponse}}
-           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo = new CommandInfo(
+           CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
                    (cluster, callback, commandArguments) -> {
                        ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
                            .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
@@ -268,11 +268,11 @@ public class ClusterInfoMapping {
                        {{/chip_cluster_command_arguments}}
                        );
                    },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams
+                   () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
+                   {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
            );
            {{else}}
-           CommandInfo {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo = new CommandInfo(
+           CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
                    (cluster, callback, commandArguments) -> {
                        ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
                           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
@@ -284,15 +284,15 @@ public class ClusterInfoMapping {
                 );
                    },
                    () -> new DelegatedDefaultClusterCallback(),
-                   {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_commandParams
+                   {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
            );
            {{/if}}
-           {{asLowerCamelCase ../name}}_ClusterCommandInfo.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}_{{asLowerCamelCase name}}_CommandInfo);
+           {{asLowerCamelCase ../name}}ClusterCommandInfo.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
      {{/chip_cluster_commands}}
      // Populate cluster
-     ClusterInfo {{asLowerCamelCase name}}_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}_ClusterCommandInfo);
-     clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}_clusterInfo);
+     ClusterInfo {{asLowerCamelCase name}}ClusterInfo = new ClusterInfo(
+          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfo);
+     clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
      {{/chip_client_clusters}}
 <<<<<<< HEAD
 <<<<<<< HEAD
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 0836d9df99081a..0cdb705cf34737 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -9298,21 +9298,26 @@ public void onError(Exception error) {
 
   public Map<String, ClusterInfo> getClusterMap() {
     Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
-    Map<String, CommandParameter> accountLogin_getSetupPIN_commandParams =
-        new HashMap<String, CommandParameter>();
+    Map<String, CommandInfo> accountLoginClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> accountLogingetSetupPINCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
     // TODO: fill out parameter types
-    CommandParameter accountLogin_getSetupPIN_commandParameter =
+    CommandParameter accountLogingetSetupPINCommandParameter =
         new CommandParameter(
             "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
-    CommandParameter accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter =
+    CommandParameter accountLogingetSetupPINtempAccountIdentifierCommandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
+<<<<<<< HEAD
     accountLogin_getSetupPIN_commandParams.put(
         "tempAccountIdentifier", accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    accountLogingetSetupPINCommandParams.put(
+        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo accountLogin_getSetupPIN_CommandInfo =
+    CommandInfo accountLogingetSetupPINCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9324,6 +9329,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("tempAccountIdentifier"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             accountLogin_getSetupPIN_commandParams);
     accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
@@ -9341,21 +9347,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> accountLogin_login_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetSetupPINResponseCallback(),
+            accountLogingetSetupPINCommandParams);
+    accountLoginClusterCommandInfo.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
+    Map<String, CommandParameter> accountLoginloginCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter accountLogin_login_commandParameter =
+    CommandParameter accountLoginloginCommandParameter =
         new CommandParameter("AccountLogin", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter accountLogin_login_tempAccountIdentifier_commandParameter =
+    CommandParameter accountLoginlogintempAccountIdentifierCommandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_login_commandParams.put(
-        "tempAccountIdentifier", accountLogin_login_tempAccountIdentifier_commandParameter);
+    accountLoginloginCommandParams.put(
+        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameter);
 
-    CommandParameter accountLogin_login_setupPIN_commandParameter =
+    CommandParameter accountLoginloginsetupPINCommandParameter =
         new CommandParameter("setupPIN", String.class);
+<<<<<<< HEAD
     accountLogin_login_commandParams.put("setupPIN", accountLogin_login_setupPIN_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo accountLogin_login_CommandInfo =
+    CommandInfo accountLoginloginCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9369,12 +9386,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            accountLogin_login_commandParams);
-    accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
+            accountLoginloginCommandParams);
+    accountLoginClusterCommandInfo.put("login", accountLoginloginCommandInfo);
     // Populate cluster
-    ClusterInfo accountLogin_clusterInfo =
+    ClusterInfo accountLoginClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
+<<<<<<< HEAD
             accountLogin_ClusterCommandInfo);
     clusterMap.put("accountLogin", accountLogin_clusterInfo);
     Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
@@ -9388,23 +9406,32 @@ public Map<String, ClusterInfo> getClusterMap() {
     administratorCommissioning_openBasicCommissioningWindow_commandParams.add(
         openBasicCommissioningWindow_commissioningTimeout_commandParameter);
 =======
+=======
+            accountLoginClusterCommandInfo);
+    clusterMap.put("accountLogin", accountLoginClusterInfo);
+    Map<String, CommandInfo> administratorCommissioningClusterCommandInfo = new LinkedHashMap<>();
+>>>>>>> 41b0956c1 (on/off commands working)
     Map<String, CommandParameter>
-        administratorCommissioning_openBasicCommissioningWindow_commandParams =
-            new HashMap<String, CommandParameter>();
+        administratorCommissioningopenBasicCommissioningWindowCommandParams =
+            new LinkedHashMap<String, CommandParameter>();
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioning_openBasicCommissioningWindow_commandParameter =
+    CommandParameter administratorCommissioningopenBasicCommissioningWindowCommandParameter =
         new CommandParameter(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameter
-        administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter =
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameter =
             new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openBasicCommissioningWindow_commandParams.put(
+    administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
         "commissioningTimeout",
+<<<<<<< HEAD
         administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo =
+    CommandInfo administratorCommissioningopenBasicCommissioningWindowCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9417,9 +9444,10 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioning_openBasicCommissioningWindow_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
+            administratorCommissioningopenBasicCommissioningWindowCommandParams);
+    administratorCommissioningClusterCommandInfo.put(
         "openBasicCommissioningWindow",
+<<<<<<< HEAD
         administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
 <<<<<<< HEAD
     List<CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
@@ -9458,43 +9486,46 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+        administratorCommissioningopenBasicCommissioningWindowCommandInfo);
+    Map<String, CommandParameter> administratorCommissioningopenCommissioningWindowCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioning_openCommissioningWindow_commandParameter =
+    CommandParameter administratorCommissioningopenCommissioningWindowCommandParameter =
         new CommandParameter(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameter
-        administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter =
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameter =
             new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
         "commissioningTimeout",
-        administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter);
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameter);
 
-    CommandParameter
-        administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter =
-            new CommandParameter("PAKEVerifier", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
+    CommandParameter administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameter =
+        new CommandParameter("PAKEVerifier", byte[].class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
         "PAKEVerifier",
-        administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter);
+        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameter);
 
     CommandParameter
-        administratorCommissioning_openCommissioningWindow_discriminator_commandParameter =
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameter =
             new CommandParameter("discriminator", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
         "discriminator",
-        administratorCommissioning_openCommissioningWindow_discriminator_commandParameter);
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameter);
 
-    CommandParameter
-        administratorCommissioning_openCommissioningWindow_iterations_commandParameter =
-            new CommandParameter("iterations", long.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
-        "iterations",
-        administratorCommissioning_openCommissioningWindow_iterations_commandParameter);
+    CommandParameter administratorCommissioningopenCommissioningWindowiterationsCommandParameter =
+        new CommandParameter("iterations", long.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "iterations", administratorCommissioningopenCommissioningWindowiterationsCommandParameter);
 
-    CommandParameter administratorCommissioning_openCommissioningWindow_salt_commandParameter =
+    CommandParameter administratorCommissioningopenCommissioningWindowsaltCommandParameter =
         new CommandParameter("salt", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
-        "salt", administratorCommissioning_openCommissioningWindow_salt_commandParameter);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameter);
 
+<<<<<<< HEAD
     CommandParameter
         administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter =
             new CommandParameter("passcodeID", int.class);
@@ -9502,9 +9533,15 @@ public Map<String, ClusterInfo> getClusterMap() {
         "passcodeID",
         administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    CommandParameter administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameter =
+        new CommandParameter("passcodeID", int.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "passcodeID", administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo =
+    CommandInfo administratorCommissioningopenCommissioningWindowCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9522,6 +9559,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             administratorCommissioning_openCommissioningWindow_commandParams);
     administratorCommissioning_ClusterCommandInfo.put(
         "openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
@@ -9533,13 +9571,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            administratorCommissioningopenCommissioningWindowCommandParams);
+    administratorCommissioningClusterCommandInfo.put(
+        "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
+    Map<String, CommandParameter> administratorCommissioningrevokeCommissioningCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioning_revokeCommissioning_commandParameter =
+    CommandParameter administratorCommissioningrevokeCommissioningCommandParameter =
         new CommandParameter(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo =
+    CommandInfo administratorCommissioningrevokeCommissioningCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9550,14 +9595,15 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioning_revokeCommissioning_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
-        "revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
+            administratorCommissioningrevokeCommissioningCommandParams);
+    administratorCommissioningClusterCommandInfo.put(
+        "revokeCommissioning", administratorCommissioningrevokeCommissioningCommandInfo);
     // Populate cluster
-    ClusterInfo administratorCommissioning_clusterInfo =
+    ClusterInfo administratorCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
+<<<<<<< HEAD
             administratorCommissioning_ClusterCommandInfo);
     clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
     Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
@@ -9571,17 +9617,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> applicationBasic_changeStatus_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            administratorCommissioningClusterCommandInfo);
+    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
+    Map<String, CommandInfo> applicationBasicClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> applicationBasicchangeStatusCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter applicationBasic_changeStatus_commandParameter =
+    CommandParameter applicationBasicchangeStatusCommandParameter =
         new CommandParameter("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter applicationBasic_changeStatus_status_commandParameter =
+    CommandParameter applicationBasicchangeStatusstatusCommandParameter =
         new CommandParameter("status", int.class);
+<<<<<<< HEAD
     applicationBasic_changeStatus_commandParams.put(
         "status", applicationBasic_changeStatus_status_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    applicationBasicchangeStatusCommandParams.put(
+        "status", applicationBasicchangeStatusstatusCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo applicationBasic_changeStatus_CommandInfo =
+    CommandInfo applicationBasicchangeStatusCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9593,13 +9651,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            applicationBasic_changeStatus_commandParams);
-    applicationBasic_ClusterCommandInfo.put(
-        "changeStatus", applicationBasic_changeStatus_CommandInfo);
+            applicationBasicchangeStatusCommandParams);
+    applicationBasicClusterCommandInfo.put("changeStatus", applicationBasicchangeStatusCommandInfo);
     // Populate cluster
-    ClusterInfo applicationBasic_clusterInfo =
+    ClusterInfo applicationBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
             applicationBasic_ClusterCommandInfo);
     clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
     Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
@@ -9620,29 +9678,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> applicationLauncher_launchApp_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            applicationBasicClusterCommandInfo);
+    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
+    Map<String, CommandInfo> applicationLauncherClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> applicationLauncherlaunchAppCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter applicationLauncher_launchApp_commandParameter =
+    CommandParameter applicationLauncherlaunchAppCommandParameter =
         new CommandParameter(
             "ApplicationLauncher",
             ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
-    CommandParameter applicationLauncher_launchApp_data_commandParameter =
+    CommandParameter applicationLauncherlaunchAppdataCommandParameter =
         new CommandParameter("data", String.class);
-    applicationLauncher_launchApp_commandParams.put(
-        "data", applicationLauncher_launchApp_data_commandParameter);
+    applicationLauncherlaunchAppCommandParams.put(
+        "data", applicationLauncherlaunchAppdataCommandParameter);
 
-    CommandParameter applicationLauncher_launchApp_catalogVendorId_commandParameter =
+    CommandParameter applicationLauncherlaunchAppcatalogVendorIdCommandParameter =
         new CommandParameter("catalogVendorId", int.class);
-    applicationLauncher_launchApp_commandParams.put(
-        "catalogVendorId", applicationLauncher_launchApp_catalogVendorId_commandParameter);
+    applicationLauncherlaunchAppCommandParams.put(
+        "catalogVendorId", applicationLauncherlaunchAppcatalogVendorIdCommandParameter);
 
-    CommandParameter applicationLauncher_launchApp_applicationId_commandParameter =
+    CommandParameter applicationLauncherlaunchAppapplicationIdCommandParameter =
         new CommandParameter("applicationId", String.class);
+<<<<<<< HEAD
     applicationLauncher_launchApp_commandParams.put(
         "applicationId", applicationLauncher_launchApp_applicationId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    applicationLauncherlaunchAppCommandParams.put(
+        "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo applicationLauncher_launchApp_CommandInfo =
+    CommandInfo applicationLauncherlaunchAppCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9656,14 +9726,14 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("applicationId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            applicationLauncher_launchApp_commandParams);
-    applicationLauncher_ClusterCommandInfo.put(
-        "launchApp", applicationLauncher_launchApp_CommandInfo);
+            () -> new DelegatedLaunchAppResponseCallback(),
+            applicationLauncherlaunchAppCommandParams);
+    applicationLauncherClusterCommandInfo.put("launchApp", applicationLauncherlaunchAppCommandInfo);
     // Populate cluster
-    ClusterInfo applicationLauncher_clusterInfo =
+    ClusterInfo applicationLauncherClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
+<<<<<<< HEAD
             applicationLauncher_ClusterCommandInfo);
     clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
     Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
@@ -9680,22 +9750,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> audioOutput_renameOutput_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            applicationLauncherClusterCommandInfo);
+    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
+    Map<String, CommandInfo> audioOutputClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> audioOutputrenameOutputCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter audioOutput_renameOutput_commandParameter =
+    CommandParameter audioOutputrenameOutputCommandParameter =
         new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter audioOutput_renameOutput_index_commandParameter =
+    CommandParameter audioOutputrenameOutputindexCommandParameter =
         new CommandParameter("index", int.class);
-    audioOutput_renameOutput_commandParams.put(
-        "index", audioOutput_renameOutput_index_commandParameter);
+    audioOutputrenameOutputCommandParams.put("index", audioOutputrenameOutputindexCommandParameter);
 
-    CommandParameter audioOutput_renameOutput_name_commandParameter =
+    CommandParameter audioOutputrenameOutputnameCommandParameter =
         new CommandParameter("name", String.class);
+<<<<<<< HEAD
     audioOutput_renameOutput_commandParams.put(
         "name", audioOutput_renameOutput_name_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    audioOutputrenameOutputCommandParams.put("name", audioOutputrenameOutputnameCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo audioOutput_renameOutput_CommandInfo =
+    CommandInfo audioOutputrenameOutputCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9709,6 +9789,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             audioOutput_renameOutput_commandParams);
     audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
 <<<<<<< HEAD
@@ -9720,17 +9801,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> audioOutput_selectOutput_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            audioOutputrenameOutputCommandParams);
+    audioOutputClusterCommandInfo.put("renameOutput", audioOutputrenameOutputCommandInfo);
+    Map<String, CommandParameter> audioOutputselectOutputCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter audioOutput_selectOutput_commandParameter =
+    CommandParameter audioOutputselectOutputCommandParameter =
         new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter audioOutput_selectOutput_index_commandParameter =
+    CommandParameter audioOutputselectOutputindexCommandParameter =
         new CommandParameter("index", int.class);
+<<<<<<< HEAD
     audioOutput_selectOutput_commandParams.put(
         "index", audioOutput_selectOutput_index_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    audioOutputselectOutputCommandParams.put("index", audioOutputselectOutputindexCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo audioOutput_selectOutput_CommandInfo =
+    CommandInfo audioOutputselectOutputCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9742,12 +9833,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            audioOutput_selectOutput_commandParams);
-    audioOutput_ClusterCommandInfo.put("selectOutput", audioOutput_selectOutput_CommandInfo);
+            audioOutputselectOutputCommandParams);
+    audioOutputClusterCommandInfo.put("selectOutput", audioOutputselectOutputCommandInfo);
     // Populate cluster
-    ClusterInfo audioOutput_clusterInfo =
+    ClusterInfo audioOutputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
+<<<<<<< HEAD
             audioOutput_ClusterCommandInfo);
     clusterMap.put("audioOutput", audioOutput_clusterInfo);
     Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
@@ -9763,17 +9855,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            audioOutputClusterCommandInfo);
+    clusterMap.put("audioOutput", audioOutputClusterInfo);
+    Map<String, CommandInfo> barrierControlClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> barrierControlbarrierControlGoToPercentCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter barrierControl_barrierControlGoToPercent_commandParameter =
+    CommandParameter barrierControlbarrierControlGoToPercentCommandParameter =
         new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter barrierControl_barrierControlGoToPercent_percentOpen_commandParameter =
+    CommandParameter barrierControlbarrierControlGoToPercentpercentOpenCommandParameter =
         new CommandParameter("percentOpen", int.class);
+<<<<<<< HEAD
     barrierControl_barrierControlGoToPercent_commandParams.put(
         "percentOpen", barrierControl_barrierControlGoToPercent_percentOpen_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    barrierControlbarrierControlGoToPercentCommandParams.put(
+        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo barrierControl_barrierControlGoToPercent_CommandInfo =
+    CommandInfo barrierControlbarrierControlGoToPercentCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9786,6 +9890,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             barrierControl_barrierControlGoToPercent_commandParams);
     barrierControl_ClusterCommandInfo.put(
         "barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
@@ -9796,12 +9901,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> barrierControl_barrierControlStop_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            barrierControlbarrierControlGoToPercentCommandParams);
+    barrierControlClusterCommandInfo.put(
+        "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
+    Map<String, CommandParameter> barrierControlbarrierControlStopCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter barrierControl_barrierControlStop_commandParameter =
+    CommandParameter barrierControlbarrierControlStopCommandParameter =
         new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo barrierControl_barrierControlStop_CommandInfo =
+    CommandInfo barrierControlbarrierControlStopCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9812,13 +9924,14 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            barrierControl_barrierControlStop_commandParams);
-    barrierControl_ClusterCommandInfo.put(
-        "barrierControlStop", barrierControl_barrierControlStop_CommandInfo);
+            barrierControlbarrierControlStopCommandParams);
+    barrierControlClusterCommandInfo.put(
+        "barrierControlStop", barrierControlbarrierControlStopCommandInfo);
     // Populate cluster
-    ClusterInfo barrierControl_clusterInfo =
+    ClusterInfo barrierControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
+<<<<<<< HEAD
             barrierControl_ClusterCommandInfo);
     clusterMap.put("barrierControl", barrierControl_clusterInfo);
     Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
@@ -9829,12 +9942,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> basic_mfgSpecificPing_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            barrierControlClusterCommandInfo);
+    clusterMap.put("barrierControl", barrierControlClusterInfo);
+    Map<String, CommandInfo> basicClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> basicmfgSpecificPingCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter basic_mfgSpecificPing_commandParameter =
+    CommandParameter basicmfgSpecificPingCommandParameter =
         new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo basic_mfgSpecificPing_CommandInfo =
+    CommandInfo basicmfgSpecificPingCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9845,19 +9965,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            basic_mfgSpecificPing_commandParams);
-    basic_ClusterCommandInfo.put("mfgSpecificPing", basic_mfgSpecificPing_CommandInfo);
+            basicmfgSpecificPingCommandParams);
+    basicClusterCommandInfo.put("mfgSpecificPing", basicmfgSpecificPingCommandInfo);
     // Populate cluster
-    ClusterInfo basic_clusterInfo =
+    ClusterInfo basicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId),
-            basic_ClusterCommandInfo);
-    clusterMap.put("basic", basic_clusterInfo);
-    Map<String, CommandInfo> binaryInputBasic_ClusterCommandInfo = new HashMap<>();
+            basicClusterCommandInfo);
+    clusterMap.put("basic", basicClusterInfo);
+    Map<String, CommandInfo> binaryInputBasicClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo binaryInputBasic_clusterInfo =
+    ClusterInfo binaryInputBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
             binaryInputBasic_ClusterCommandInfo);
     clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
     Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
@@ -9881,28 +10002,38 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> binding_bind_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            binaryInputBasicClusterCommandInfo);
+    clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
+    Map<String, CommandInfo> bindingClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> bindingbindCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter binding_bind_commandParameter =
+    CommandParameter bindingbindCommandParameter =
         new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter binding_bind_nodeId_commandParameter =
-        new CommandParameter("nodeId", long.class);
-    binding_bind_commandParams.put("nodeId", binding_bind_nodeId_commandParameter);
+    CommandParameter bindingbindnodeIdCommandParameter = new CommandParameter("nodeId", long.class);
+    bindingbindCommandParams.put("nodeId", bindingbindnodeIdCommandParameter);
 
-    CommandParameter binding_bind_groupId_commandParameter =
+    CommandParameter bindingbindgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    binding_bind_commandParams.put("groupId", binding_bind_groupId_commandParameter);
+    bindingbindCommandParams.put("groupId", bindingbindgroupIdCommandParameter);
 
-    CommandParameter binding_bind_endpointId_commandParameter =
+    CommandParameter bindingbindendpointIdCommandParameter =
         new CommandParameter("endpointId", int.class);
-    binding_bind_commandParams.put("endpointId", binding_bind_endpointId_commandParameter);
+    bindingbindCommandParams.put("endpointId", bindingbindendpointIdCommandParameter);
 
-    CommandParameter binding_bind_clusterId_commandParameter =
+    CommandParameter bindingbindclusterIdCommandParameter =
         new CommandParameter("clusterId", long.class);
+<<<<<<< HEAD
     binding_bind_commandParams.put("clusterId", binding_bind_clusterId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    bindingbindCommandParams.put("clusterId", bindingbindclusterIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo binding_bind_CommandInfo =
+    CommandInfo bindingbindCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9918,6 +10049,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             binding_bind_commandParams);
     binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
 <<<<<<< HEAD
@@ -9940,28 +10072,38 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> binding_unbind_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            bindingbindCommandParams);
+    bindingClusterCommandInfo.put("bind", bindingbindCommandInfo);
+    Map<String, CommandParameter> bindingunbindCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter binding_unbind_commandParameter =
+    CommandParameter bindingunbindCommandParameter =
         new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter binding_unbind_nodeId_commandParameter =
+    CommandParameter bindingunbindnodeIdCommandParameter =
         new CommandParameter("nodeId", long.class);
-    binding_unbind_commandParams.put("nodeId", binding_unbind_nodeId_commandParameter);
+    bindingunbindCommandParams.put("nodeId", bindingunbindnodeIdCommandParameter);
 
-    CommandParameter binding_unbind_groupId_commandParameter =
+    CommandParameter bindingunbindgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    binding_unbind_commandParams.put("groupId", binding_unbind_groupId_commandParameter);
+    bindingunbindCommandParams.put("groupId", bindingunbindgroupIdCommandParameter);
 
-    CommandParameter binding_unbind_endpointId_commandParameter =
+    CommandParameter bindingunbindendpointIdCommandParameter =
         new CommandParameter("endpointId", int.class);
-    binding_unbind_commandParams.put("endpointId", binding_unbind_endpointId_commandParameter);
+    bindingunbindCommandParams.put("endpointId", bindingunbindendpointIdCommandParameter);
 
-    CommandParameter binding_unbind_clusterId_commandParameter =
+    CommandParameter bindingunbindclusterIdCommandParameter =
         new CommandParameter("clusterId", long.class);
+<<<<<<< HEAD
     binding_unbind_commandParams.put("clusterId", binding_unbind_clusterId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    bindingunbindCommandParams.put("clusterId", bindingunbindclusterIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo binding_unbind_CommandInfo =
+    CommandInfo bindingunbindCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -9977,19 +10119,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            binding_unbind_commandParams);
-    binding_ClusterCommandInfo.put("unbind", binding_unbind_CommandInfo);
+            bindingunbindCommandParams);
+    bindingClusterCommandInfo.put("unbind", bindingunbindCommandInfo);
     // Populate cluster
-    ClusterInfo binding_clusterInfo =
+    ClusterInfo bindingClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId),
-            binding_ClusterCommandInfo);
-    clusterMap.put("binding", binding_clusterInfo);
-    Map<String, CommandInfo> bridgedDeviceBasic_ClusterCommandInfo = new HashMap<>();
+            bindingClusterCommandInfo);
+    clusterMap.put("binding", bindingClusterInfo);
+    Map<String, CommandInfo> bridgedDeviceBasicClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo bridgedDeviceBasic_clusterInfo =
+    ClusterInfo bridgedDeviceBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
             bridgedDeviceBasic_ClusterCommandInfo);
     clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
     Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
@@ -10026,47 +10169,58 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_colorLoopSet_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            bridgedDeviceBasicClusterCommandInfo);
+    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
+    Map<String, CommandInfo> colorControlClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> colorControlcolorLoopSetCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_colorLoopSet_commandParameter =
+    CommandParameter colorControlcolorLoopSetCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_colorLoopSet_updateFlags_commandParameter =
+    CommandParameter colorControlcolorLoopSetupdateFlagsCommandParameter =
         new CommandParameter("updateFlags", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "updateFlags", colorControl_colorLoopSet_updateFlags_commandParameter);
+    colorControlcolorLoopSetCommandParams.put(
+        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_action_commandParameter =
+    CommandParameter colorControlcolorLoopSetactionCommandParameter =
         new CommandParameter("action", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "action", colorControl_colorLoopSet_action_commandParameter);
+    colorControlcolorLoopSetCommandParams.put(
+        "action", colorControlcolorLoopSetactionCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_direction_commandParameter =
+    CommandParameter colorControlcolorLoopSetdirectionCommandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "direction", colorControl_colorLoopSet_direction_commandParameter);
+    colorControlcolorLoopSetCommandParams.put(
+        "direction", colorControlcolorLoopSetdirectionCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_time_commandParameter =
+    CommandParameter colorControlcolorLoopSettimeCommandParameter =
         new CommandParameter("time", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "time", colorControl_colorLoopSet_time_commandParameter);
+    colorControlcolorLoopSetCommandParams.put("time", colorControlcolorLoopSettimeCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_startHue_commandParameter =
+    CommandParameter colorControlcolorLoopSetstartHueCommandParameter =
         new CommandParameter("startHue", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "startHue", colorControl_colorLoopSet_startHue_commandParameter);
+    colorControlcolorLoopSetCommandParams.put(
+        "startHue", colorControlcolorLoopSetstartHueCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_optionsMask_commandParameter =
+    CommandParameter colorControlcolorLoopSetoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_colorLoopSet_commandParams.put(
-        "optionsMask", colorControl_colorLoopSet_optionsMask_commandParameter);
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_colorLoopSet_optionsOverride_commandParameter =
+    CommandParameter colorControlcolorLoopSetoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_colorLoopSet_commandParams.put(
         "optionsOverride", colorControl_colorLoopSet_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_colorLoopSet_CommandInfo =
+    CommandInfo colorControlcolorLoopSetCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10085,6 +10239,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_colorLoopSet_commandParams);
     colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
 <<<<<<< HEAD
@@ -10110,32 +10265,43 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_enhancedMoveHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlcolorLoopSetCommandParams);
+    colorControlClusterCommandInfo.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
+    Map<String, CommandParameter> colorControlenhancedMoveHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_enhancedMoveHue_commandParameter =
+    CommandParameter colorControlenhancedMoveHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_enhancedMoveHue_moveMode_commandParameter =
+    CommandParameter colorControlenhancedMoveHuemoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_enhancedMoveHue_commandParams.put(
-        "moveMode", colorControl_enhancedMoveHue_moveMode_commandParameter);
+    colorControlenhancedMoveHueCommandParams.put(
+        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveHue_rate_commandParameter =
+    CommandParameter colorControlenhancedMoveHuerateCommandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_enhancedMoveHue_commandParams.put(
-        "rate", colorControl_enhancedMoveHue_rate_commandParameter);
+    colorControlenhancedMoveHueCommandParams.put(
+        "rate", colorControlenhancedMoveHuerateCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveHue_optionsMask_commandParameter =
+    CommandParameter colorControlenhancedMoveHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveHue_commandParams.put(
-        "optionsMask", colorControl_enhancedMoveHue_optionsMask_commandParameter);
+    colorControlenhancedMoveHueCommandParams.put(
+        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveHue_optionsOverride_commandParameter =
+    CommandParameter colorControlenhancedMoveHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_enhancedMoveHue_commandParams.put(
         "optionsOverride", colorControl_enhancedMoveHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlenhancedMoveHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_enhancedMoveHue_CommandInfo =
+    CommandInfo colorControlenhancedMoveHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10151,6 +10317,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_enhancedMoveHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
@@ -10184,37 +10351,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_enhancedMoveToHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlenhancedMoveHueCommandParams);
+    colorControlClusterCommandInfo.put("enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
+    Map<String, CommandParameter> colorControlenhancedMoveToHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_enhancedMoveToHue_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_enhancedMoveToHue_enhancedHue_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueenhancedHueCommandParameter =
         new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHue_commandParams.put(
-        "enhancedHue", colorControl_enhancedMoveToHue_enhancedHue_commandParameter);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHue_direction_commandParameter =
+    CommandParameter colorControlenhancedMoveToHuedirectionCommandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_enhancedMoveToHue_commandParams.put(
-        "direction", colorControl_enhancedMoveToHue_direction_commandParameter);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "direction", colorControlenhancedMoveToHuedirectionCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHue_transitionTime_commandParameter =
+    CommandParameter colorControlenhancedMoveToHuetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHue_commandParams.put(
-        "transitionTime", colorControl_enhancedMoveToHue_transitionTime_commandParameter);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHue_optionsMask_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHue_commandParams.put(
-        "optionsMask", colorControl_enhancedMoveToHue_optionsMask_commandParameter);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHue_optionsOverride_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_enhancedMoveToHue_commandParams.put(
         "optionsOverride", colorControl_enhancedMoveToHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlenhancedMoveToHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_enhancedMoveToHue_CommandInfo =
+    CommandInfo colorControlenhancedMoveToHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10231,6 +10409,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_enhancedMoveToHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
@@ -10266,39 +10445,49 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlenhancedMoveToHueCommandParams);
+    colorControlClusterCommandInfo.put(
+        "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
+    Map<String, CommandParameter> colorControlenhancedMoveToHueAndSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameter =
         new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
-        "enhancedHue", colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationsaturationCommandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
-        "saturation", colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
-        "transitionTime",
-        colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "transitionTime", colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
-        "optionsMask", colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
+        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter =
+    CommandParameter colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.put(
+    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsOverride",
+<<<<<<< HEAD
         colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_enhancedMoveToHueAndSaturation_CommandInfo =
+    CommandInfo colorControlenhancedMoveToHueAndSaturationCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10315,6 +10504,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_enhancedMoveToHueAndSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
@@ -10345,37 +10535,49 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_enhancedStepHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlenhancedMoveToHueAndSaturationCommandParams);
+    colorControlClusterCommandInfo.put(
+        "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
+    Map<String, CommandParameter> colorControlenhancedStepHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_enhancedStepHue_commandParameter =
+    CommandParameter colorControlenhancedStepHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_enhancedStepHue_stepMode_commandParameter =
+    CommandParameter colorControlenhancedStepHuestepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_enhancedStepHue_commandParams.put(
-        "stepMode", colorControl_enhancedStepHue_stepMode_commandParameter);
+    colorControlenhancedStepHueCommandParams.put(
+        "stepMode", colorControlenhancedStepHuestepModeCommandParameter);
 
-    CommandParameter colorControl_enhancedStepHue_stepSize_commandParameter =
+    CommandParameter colorControlenhancedStepHuestepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_enhancedStepHue_commandParams.put(
-        "stepSize", colorControl_enhancedStepHue_stepSize_commandParameter);
+    colorControlenhancedStepHueCommandParams.put(
+        "stepSize", colorControlenhancedStepHuestepSizeCommandParameter);
 
-    CommandParameter colorControl_enhancedStepHue_transitionTime_commandParameter =
+    CommandParameter colorControlenhancedStepHuetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedStepHue_commandParams.put(
-        "transitionTime", colorControl_enhancedStepHue_transitionTime_commandParameter);
+    colorControlenhancedStepHueCommandParams.put(
+        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_enhancedStepHue_optionsMask_commandParameter =
+    CommandParameter colorControlenhancedStepHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedStepHue_commandParams.put(
-        "optionsMask", colorControl_enhancedStepHue_optionsMask_commandParameter);
+    colorControlenhancedStepHueCommandParams.put(
+        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_enhancedStepHue_optionsOverride_commandParameter =
+    CommandParameter colorControlenhancedStepHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_enhancedStepHue_commandParams.put(
         "optionsOverride", colorControl_enhancedStepHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlenhancedStepHueCommandParams.put(
+        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_enhancedStepHue_CommandInfo =
+    CommandInfo colorControlenhancedStepHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10392,6 +10594,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_enhancedStepHue_commandParams);
     colorControl_ClusterCommandInfo.put(
         "enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
@@ -10415,32 +10618,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveColor_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlenhancedStepHueCommandParams);
+    colorControlClusterCommandInfo.put("enhancedStepHue", colorControlenhancedStepHueCommandInfo);
+    Map<String, CommandParameter> colorControlmoveColorCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveColor_commandParameter =
+    CommandParameter colorControlmoveColorCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveColor_rateX_commandParameter =
+    CommandParameter colorControlmoveColorrateXCommandParameter =
         new CommandParameter("rateX", int.class);
-    colorControl_moveColor_commandParams.put(
-        "rateX", colorControl_moveColor_rateX_commandParameter);
+    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameter);
 
-    CommandParameter colorControl_moveColor_rateY_commandParameter =
+    CommandParameter colorControlmoveColorrateYCommandParameter =
         new CommandParameter("rateY", int.class);
-    colorControl_moveColor_commandParams.put(
-        "rateY", colorControl_moveColor_rateY_commandParameter);
+    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameter);
 
-    CommandParameter colorControl_moveColor_optionsMask_commandParameter =
+    CommandParameter colorControlmoveColoroptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveColor_commandParams.put(
-        "optionsMask", colorControl_moveColor_optionsMask_commandParameter);
+    colorControlmoveColorCommandParams.put(
+        "optionsMask", colorControlmoveColoroptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveColor_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveColor_commandParams.put(
         "optionsOverride", colorControl_moveColor_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveColorCommandParams.put(
+        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveColor_CommandInfo =
+    CommandInfo colorControlmoveColorCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10456,6 +10668,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveColor_commandParams);
     colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
 <<<<<<< HEAD
@@ -10493,44 +10706,55 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveColorTemperature_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveColorCommandParams);
+    colorControlClusterCommandInfo.put("moveColor", colorControlmoveColorCommandInfo);
+    Map<String, CommandParameter> colorControlmoveColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveColorTemperature_commandParameter =
+    CommandParameter colorControlmoveColorTemperatureCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveColorTemperature_moveMode_commandParameter =
+    CommandParameter colorControlmoveColorTemperaturemoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveColorTemperature_commandParams.put(
-        "moveMode", colorControl_moveColorTemperature_moveMode_commandParameter);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameter);
 
-    CommandParameter colorControl_moveColorTemperature_rate_commandParameter =
+    CommandParameter colorControlmoveColorTemperaturerateCommandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_moveColorTemperature_commandParams.put(
-        "rate", colorControl_moveColorTemperature_rate_commandParameter);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "rate", colorControlmoveColorTemperaturerateCommandParameter);
 
-    CommandParameter colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter =
+    CommandParameter colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameter =
         new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_moveColorTemperature_commandParams.put(
+    colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMinimum",
-        colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter);
+        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameter);
 
-    CommandParameter colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter =
+    CommandParameter colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameter =
         new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_moveColorTemperature_commandParams.put(
+    colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMaximum",
-        colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter);
+        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameter);
 
-    CommandParameter colorControl_moveColorTemperature_optionsMask_commandParameter =
+    CommandParameter colorControlmoveColorTemperatureoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveColorTemperature_commandParams.put(
-        "optionsMask", colorControl_moveColorTemperature_optionsMask_commandParameter);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveColorTemperature_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveColorTemperature_commandParams.put(
         "optionsOverride", colorControl_moveColorTemperature_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveColorTemperature_CommandInfo =
+    CommandInfo colorControlmoveColorTemperatureCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10548,6 +10772,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
@@ -10572,31 +10797,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveColorTemperatureCommandParams);
+    colorControlClusterCommandInfo.put(
+        "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
+    Map<String, CommandParameter> colorControlmoveHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveHue_commandParameter =
+    CommandParameter colorControlmoveHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveHue_moveMode_commandParameter =
+    CommandParameter colorControlmoveHuemoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveHue_commandParams.put(
-        "moveMode", colorControl_moveHue_moveMode_commandParameter);
+    colorControlmoveHueCommandParams.put("moveMode", colorControlmoveHuemoveModeCommandParameter);
 
-    CommandParameter colorControl_moveHue_rate_commandParameter =
+    CommandParameter colorControlmoveHuerateCommandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_moveHue_commandParams.put("rate", colorControl_moveHue_rate_commandParameter);
+    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameter);
 
-    CommandParameter colorControl_moveHue_optionsMask_commandParameter =
+    CommandParameter colorControlmoveHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveHue_commandParams.put(
-        "optionsMask", colorControl_moveHue_optionsMask_commandParameter);
+    colorControlmoveHueCommandParams.put(
+        "optionsMask", colorControlmoveHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveHue_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveHue_commandParams.put(
         "optionsOverride", colorControl_moveHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveHueCommandParams.put(
+        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveHue_CommandInfo =
+    CommandInfo colorControlmoveHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10612,6 +10848,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveHue_commandParams);
     colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
 <<<<<<< HEAD
@@ -10635,32 +10872,43 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveSaturation_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveHueCommandParams);
+    colorControlClusterCommandInfo.put("moveHue", colorControlmoveHueCommandInfo);
+    Map<String, CommandParameter> colorControlmoveSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveSaturation_commandParameter =
+    CommandParameter colorControlmoveSaturationCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveSaturation_moveMode_commandParameter =
+    CommandParameter colorControlmoveSaturationmoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    colorControl_moveSaturation_commandParams.put(
-        "moveMode", colorControl_moveSaturation_moveMode_commandParameter);
+    colorControlmoveSaturationCommandParams.put(
+        "moveMode", colorControlmoveSaturationmoveModeCommandParameter);
 
-    CommandParameter colorControl_moveSaturation_rate_commandParameter =
+    CommandParameter colorControlmoveSaturationrateCommandParameter =
         new CommandParameter("rate", int.class);
-    colorControl_moveSaturation_commandParams.put(
-        "rate", colorControl_moveSaturation_rate_commandParameter);
+    colorControlmoveSaturationCommandParams.put(
+        "rate", colorControlmoveSaturationrateCommandParameter);
 
-    CommandParameter colorControl_moveSaturation_optionsMask_commandParameter =
+    CommandParameter colorControlmoveSaturationoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveSaturation_commandParams.put(
-        "optionsMask", colorControl_moveSaturation_optionsMask_commandParameter);
+    colorControlmoveSaturationCommandParams.put(
+        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveSaturation_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveSaturation_commandParams.put(
         "optionsOverride", colorControl_moveSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveSaturation_CommandInfo =
+    CommandInfo colorControlmoveSaturationCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10676,6 +10924,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveSaturation_commandParams);
     colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
 <<<<<<< HEAD
@@ -10704,37 +10953,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveToColor_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveSaturationCommandParams);
+    colorControlClusterCommandInfo.put("moveSaturation", colorControlmoveSaturationCommandInfo);
+    Map<String, CommandParameter> colorControlmoveToColorCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveToColor_commandParameter =
+    CommandParameter colorControlmoveToColorCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveToColor_colorX_commandParameter =
+    CommandParameter colorControlmoveToColorcolorXCommandParameter =
         new CommandParameter("colorX", int.class);
-    colorControl_moveToColor_commandParams.put(
-        "colorX", colorControl_moveToColor_colorX_commandParameter);
+    colorControlmoveToColorCommandParams.put(
+        "colorX", colorControlmoveToColorcolorXCommandParameter);
 
-    CommandParameter colorControl_moveToColor_colorY_commandParameter =
+    CommandParameter colorControlmoveToColorcolorYCommandParameter =
         new CommandParameter("colorY", int.class);
-    colorControl_moveToColor_commandParams.put(
-        "colorY", colorControl_moveToColor_colorY_commandParameter);
+    colorControlmoveToColorCommandParams.put(
+        "colorY", colorControlmoveToColorcolorYCommandParameter);
 
-    CommandParameter colorControl_moveToColor_transitionTime_commandParameter =
+    CommandParameter colorControlmoveToColortransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColor_commandParams.put(
-        "transitionTime", colorControl_moveToColor_transitionTime_commandParameter);
+    colorControlmoveToColorCommandParams.put(
+        "transitionTime", colorControlmoveToColortransitionTimeCommandParameter);
 
-    CommandParameter colorControl_moveToColor_optionsMask_commandParameter =
+    CommandParameter colorControlmoveToColoroptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColor_commandParams.put(
-        "optionsMask", colorControl_moveToColor_optionsMask_commandParameter);
+    colorControlmoveToColorCommandParams.put(
+        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveToColor_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveToColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveToColor_commandParams.put(
         "optionsOverride", colorControl_moveToColor_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveToColorCommandParams.put(
+        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveToColor_CommandInfo =
+    CommandInfo colorControlmoveToColorCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10751,6 +11011,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveToColor_commandParams);
     colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
 <<<<<<< HEAD
@@ -10779,32 +11040,43 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveToColorTemperature_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveToColorCommandParams);
+    colorControlClusterCommandInfo.put("moveToColor", colorControlmoveToColorCommandInfo);
+    Map<String, CommandParameter> colorControlmoveToColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveToColorTemperature_commandParameter =
+    CommandParameter colorControlmoveToColorTemperatureCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveToColorTemperature_colorTemperature_commandParameter =
+    CommandParameter colorControlmoveToColorTemperaturecolorTemperatureCommandParameter =
         new CommandParameter("colorTemperature", int.class);
-    colorControl_moveToColorTemperature_commandParams.put(
-        "colorTemperature", colorControl_moveToColorTemperature_colorTemperature_commandParameter);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameter);
 
-    CommandParameter colorControl_moveToColorTemperature_transitionTime_commandParameter =
+    CommandParameter colorControlmoveToColorTemperaturetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColorTemperature_commandParams.put(
-        "transitionTime", colorControl_moveToColorTemperature_transitionTime_commandParameter);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_moveToColorTemperature_optionsMask_commandParameter =
+    CommandParameter colorControlmoveToColorTemperatureoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColorTemperature_commandParams.put(
-        "optionsMask", colorControl_moveToColorTemperature_optionsMask_commandParameter);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveToColorTemperature_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveToColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveToColorTemperature_commandParams.put(
         "optionsOverride", colorControl_moveToColorTemperature_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveToColorTemperature_CommandInfo =
+    CommandInfo colorControlmoveToColorTemperatureCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10820,6 +11092,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveToColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
@@ -10848,36 +11121,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveToHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveToColorTemperatureCommandParams);
+    colorControlClusterCommandInfo.put(
+        "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
+    Map<String, CommandParameter> colorControlmoveToHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveToHue_commandParameter =
+    CommandParameter colorControlmoveToHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveToHue_hue_commandParameter =
+    CommandParameter colorControlmoveToHuehueCommandParameter =
         new CommandParameter("hue", int.class);
-    colorControl_moveToHue_commandParams.put("hue", colorControl_moveToHue_hue_commandParameter);
+    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameter);
 
-    CommandParameter colorControl_moveToHue_direction_commandParameter =
+    CommandParameter colorControlmoveToHuedirectionCommandParameter =
         new CommandParameter("direction", int.class);
-    colorControl_moveToHue_commandParams.put(
-        "direction", colorControl_moveToHue_direction_commandParameter);
+    colorControlmoveToHueCommandParams.put(
+        "direction", colorControlmoveToHuedirectionCommandParameter);
 
-    CommandParameter colorControl_moveToHue_transitionTime_commandParameter =
+    CommandParameter colorControlmoveToHuetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHue_commandParams.put(
-        "transitionTime", colorControl_moveToHue_transitionTime_commandParameter);
+    colorControlmoveToHueCommandParams.put(
+        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_moveToHue_optionsMask_commandParameter =
+    CommandParameter colorControlmoveToHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHue_commandParams.put(
-        "optionsMask", colorControl_moveToHue_optionsMask_commandParameter);
+    colorControlmoveToHueCommandParams.put(
+        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveToHue_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveToHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveToHue_commandParams.put(
         "optionsOverride", colorControl_moveToHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveToHueCommandParams.put(
+        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveToHue_CommandInfo =
+    CommandInfo colorControlmoveToHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10894,6 +11179,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveToHue_commandParams);
     colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
 <<<<<<< HEAD
@@ -10927,37 +11213,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveToHueAndSaturation_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveToHueCommandParams);
+    colorControlClusterCommandInfo.put("moveToHue", colorControlmoveToHueCommandInfo);
+    Map<String, CommandParameter> colorControlmoveToHueAndSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveToHueAndSaturation_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveToHueAndSaturation_hue_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationhueCommandParameter =
         new CommandParameter("hue", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.put(
-        "hue", colorControl_moveToHueAndSaturation_hue_commandParameter);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "hue", colorControlmoveToHueAndSaturationhueCommandParameter);
 
-    CommandParameter colorControl_moveToHueAndSaturation_saturation_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationsaturationCommandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.put(
-        "saturation", colorControl_moveToHueAndSaturation_saturation_commandParameter);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameter);
 
-    CommandParameter colorControl_moveToHueAndSaturation_transitionTime_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationtransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.put(
-        "transitionTime", colorControl_moveToHueAndSaturation_transitionTime_commandParameter);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameter);
 
-    CommandParameter colorControl_moveToHueAndSaturation_optionsMask_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.put(
-        "optionsMask", colorControl_moveToHueAndSaturation_optionsMask_commandParameter);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveToHueAndSaturation_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveToHueAndSaturation_commandParams.put(
         "optionsOverride", colorControl_moveToHueAndSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveToHueAndSaturation_CommandInfo =
+    CommandInfo colorControlmoveToHueAndSaturationCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -10974,6 +11271,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveToHueAndSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
@@ -11001,32 +11299,44 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_moveToSaturation_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveToHueAndSaturationCommandParams);
+    colorControlClusterCommandInfo.put(
+        "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
+    Map<String, CommandParameter> colorControlmoveToSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_moveToSaturation_commandParameter =
+    CommandParameter colorControlmoveToSaturationCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_moveToSaturation_saturation_commandParameter =
+    CommandParameter colorControlmoveToSaturationsaturationCommandParameter =
         new CommandParameter("saturation", int.class);
-    colorControl_moveToSaturation_commandParams.put(
-        "saturation", colorControl_moveToSaturation_saturation_commandParameter);
+    colorControlmoveToSaturationCommandParams.put(
+        "saturation", colorControlmoveToSaturationsaturationCommandParameter);
 
-    CommandParameter colorControl_moveToSaturation_transitionTime_commandParameter =
+    CommandParameter colorControlmoveToSaturationtransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_moveToSaturation_commandParams.put(
-        "transitionTime", colorControl_moveToSaturation_transitionTime_commandParameter);
+    colorControlmoveToSaturationCommandParams.put(
+        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameter);
 
-    CommandParameter colorControl_moveToSaturation_optionsMask_commandParameter =
+    CommandParameter colorControlmoveToSaturationoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_moveToSaturation_commandParams.put(
-        "optionsMask", colorControl_moveToSaturation_optionsMask_commandParameter);
+    colorControlmoveToSaturationCommandParams.put(
+        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_moveToSaturation_optionsOverride_commandParameter =
+    CommandParameter colorControlmoveToSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_moveToSaturation_commandParams.put(
         "optionsOverride", colorControl_moveToSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlmoveToSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_moveToSaturation_CommandInfo =
+    CommandInfo colorControlmoveToSaturationCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11042,6 +11352,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_moveToSaturation_commandParams);
     colorControl_ClusterCommandInfo.put(
         "moveToSaturation", colorControl_moveToSaturation_CommandInfo);
@@ -11069,37 +11380,46 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_stepColor_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlmoveToSaturationCommandParams);
+    colorControlClusterCommandInfo.put("moveToSaturation", colorControlmoveToSaturationCommandInfo);
+    Map<String, CommandParameter> colorControlstepColorCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_stepColor_commandParameter =
+    CommandParameter colorControlstepColorCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_stepColor_stepX_commandParameter =
+    CommandParameter colorControlstepColorstepXCommandParameter =
         new CommandParameter("stepX", int.class);
-    colorControl_stepColor_commandParams.put(
-        "stepX", colorControl_stepColor_stepX_commandParameter);
+    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameter);
 
-    CommandParameter colorControl_stepColor_stepY_commandParameter =
+    CommandParameter colorControlstepColorstepYCommandParameter =
         new CommandParameter("stepY", int.class);
-    colorControl_stepColor_commandParams.put(
-        "stepY", colorControl_stepColor_stepY_commandParameter);
+    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameter);
 
-    CommandParameter colorControl_stepColor_transitionTime_commandParameter =
+    CommandParameter colorControlstepColortransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepColor_commandParams.put(
-        "transitionTime", colorControl_stepColor_transitionTime_commandParameter);
+    colorControlstepColorCommandParams.put(
+        "transitionTime", colorControlstepColortransitionTimeCommandParameter);
 
-    CommandParameter colorControl_stepColor_optionsMask_commandParameter =
+    CommandParameter colorControlstepColoroptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepColor_commandParams.put(
-        "optionsMask", colorControl_stepColor_optionsMask_commandParameter);
+    colorControlstepColorCommandParams.put(
+        "optionsMask", colorControlstepColoroptionsMaskCommandParameter);
 
-    CommandParameter colorControl_stepColor_optionsOverride_commandParameter =
+    CommandParameter colorControlstepColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_stepColor_commandParams.put(
         "optionsOverride", colorControl_stepColor_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlstepColorCommandParams.put(
+        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_stepColor_CommandInfo =
+    CommandInfo colorControlstepColorCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11116,6 +11436,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_stepColor_commandParams);
     colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
 <<<<<<< HEAD
@@ -11159,49 +11480,60 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_stepColorTemperature_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlstepColorCommandParams);
+    colorControlClusterCommandInfo.put("stepColor", colorControlstepColorCommandInfo);
+    Map<String, CommandParameter> colorControlstepColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_stepColorTemperature_commandParameter =
+    CommandParameter colorControlstepColorTemperatureCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_stepColorTemperature_stepMode_commandParameter =
+    CommandParameter colorControlstepColorTemperaturestepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
-        "stepMode", colorControl_stepColorTemperature_stepMode_commandParameter);
+    colorControlstepColorTemperatureCommandParams.put(
+        "stepMode", colorControlstepColorTemperaturestepModeCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_stepSize_commandParameter =
+    CommandParameter colorControlstepColorTemperaturestepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
-        "stepSize", colorControl_stepColorTemperature_stepSize_commandParameter);
+    colorControlstepColorTemperatureCommandParams.put(
+        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_transitionTime_commandParameter =
+    CommandParameter colorControlstepColorTemperaturetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
-        "transitionTime", colorControl_stepColorTemperature_transitionTime_commandParameter);
+    colorControlstepColorTemperatureCommandParams.put(
+        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter =
+    CommandParameter colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameter =
         new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
+    colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMinimum",
-        colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter);
+        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter =
+    CommandParameter colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameter =
         new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
+    colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMaximum",
-        colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter);
+        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_optionsMask_commandParameter =
+    CommandParameter colorControlstepColorTemperatureoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepColorTemperature_commandParams.put(
-        "optionsMask", colorControl_stepColorTemperature_optionsMask_commandParameter);
+    colorControlstepColorTemperatureCommandParams.put(
+        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_stepColorTemperature_optionsOverride_commandParameter =
+    CommandParameter colorControlstepColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_stepColorTemperature_commandParams.put(
         "optionsOverride", colorControl_stepColorTemperature_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlstepColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_stepColorTemperature_CommandInfo =
+    CommandInfo colorControlstepColorTemperatureCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11220,6 +11552,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_stepColorTemperature_commandParams);
     colorControl_ClusterCommandInfo.put(
         "stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
@@ -11249,37 +11582,47 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_stepHue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlstepColorTemperatureCommandParams);
+    colorControlClusterCommandInfo.put(
+        "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
+    Map<String, CommandParameter> colorControlstepHueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_stepHue_commandParameter =
+    CommandParameter colorControlstepHueCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_stepHue_stepMode_commandParameter =
+    CommandParameter colorControlstepHuestepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_stepHue_commandParams.put(
-        "stepMode", colorControl_stepHue_stepMode_commandParameter);
+    colorControlstepHueCommandParams.put("stepMode", colorControlstepHuestepModeCommandParameter);
 
-    CommandParameter colorControl_stepHue_stepSize_commandParameter =
+    CommandParameter colorControlstepHuestepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_stepHue_commandParams.put(
-        "stepSize", colorControl_stepHue_stepSize_commandParameter);
+    colorControlstepHueCommandParams.put("stepSize", colorControlstepHuestepSizeCommandParameter);
 
-    CommandParameter colorControl_stepHue_transitionTime_commandParameter =
+    CommandParameter colorControlstepHuetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepHue_commandParams.put(
-        "transitionTime", colorControl_stepHue_transitionTime_commandParameter);
+    colorControlstepHueCommandParams.put(
+        "transitionTime", colorControlstepHuetransitionTimeCommandParameter);
 
-    CommandParameter colorControl_stepHue_optionsMask_commandParameter =
+    CommandParameter colorControlstepHueoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepHue_commandParams.put(
-        "optionsMask", colorControl_stepHue_optionsMask_commandParameter);
+    colorControlstepHueCommandParams.put(
+        "optionsMask", colorControlstepHueoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_stepHue_optionsOverride_commandParameter =
+    CommandParameter colorControlstepHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_stepHue_commandParams.put(
         "optionsOverride", colorControl_stepHue_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlstepHueCommandParams.put(
+        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_stepHue_CommandInfo =
+    CommandInfo colorControlstepHueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11296,6 +11639,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_stepHue_commandParams);
     colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
 <<<<<<< HEAD
@@ -11324,37 +11668,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_stepSaturation_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlstepHueCommandParams);
+    colorControlClusterCommandInfo.put("stepHue", colorControlstepHueCommandInfo);
+    Map<String, CommandParameter> colorControlstepSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_stepSaturation_commandParameter =
+    CommandParameter colorControlstepSaturationCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_stepSaturation_stepMode_commandParameter =
+    CommandParameter colorControlstepSaturationstepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    colorControl_stepSaturation_commandParams.put(
-        "stepMode", colorControl_stepSaturation_stepMode_commandParameter);
+    colorControlstepSaturationCommandParams.put(
+        "stepMode", colorControlstepSaturationstepModeCommandParameter);
 
-    CommandParameter colorControl_stepSaturation_stepSize_commandParameter =
+    CommandParameter colorControlstepSaturationstepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    colorControl_stepSaturation_commandParams.put(
-        "stepSize", colorControl_stepSaturation_stepSize_commandParameter);
+    colorControlstepSaturationCommandParams.put(
+        "stepSize", colorControlstepSaturationstepSizeCommandParameter);
 
-    CommandParameter colorControl_stepSaturation_transitionTime_commandParameter =
+    CommandParameter colorControlstepSaturationtransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    colorControl_stepSaturation_commandParams.put(
-        "transitionTime", colorControl_stepSaturation_transitionTime_commandParameter);
+    colorControlstepSaturationCommandParams.put(
+        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameter);
 
-    CommandParameter colorControl_stepSaturation_optionsMask_commandParameter =
+    CommandParameter colorControlstepSaturationoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stepSaturation_commandParams.put(
-        "optionsMask", colorControl_stepSaturation_optionsMask_commandParameter);
+    colorControlstepSaturationCommandParams.put(
+        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_stepSaturation_optionsOverride_commandParameter =
+    CommandParameter colorControlstepSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_stepSaturation_commandParams.put(
         "optionsOverride", colorControl_stepSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlstepSaturationCommandParams.put(
+        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_stepSaturation_CommandInfo =
+    CommandInfo colorControlstepSaturationCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11371,6 +11726,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             colorControl_stepSaturation_commandParams);
     colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
 <<<<<<< HEAD
@@ -11387,22 +11743,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> colorControl_stopMoveStep_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlstepSaturationCommandParams);
+    colorControlClusterCommandInfo.put("stepSaturation", colorControlstepSaturationCommandInfo);
+    Map<String, CommandParameter> colorControlstopMoveStepCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter colorControl_stopMoveStep_commandParameter =
+    CommandParameter colorControlstopMoveStepCommandParameter =
         new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControl_stopMoveStep_optionsMask_commandParameter =
+    CommandParameter colorControlstopMoveStepoptionsMaskCommandParameter =
         new CommandParameter("optionsMask", int.class);
-    colorControl_stopMoveStep_commandParams.put(
-        "optionsMask", colorControl_stopMoveStep_optionsMask_commandParameter);
+    colorControlstopMoveStepCommandParams.put(
+        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameter);
 
-    CommandParameter colorControl_stopMoveStep_optionsOverride_commandParameter =
+    CommandParameter colorControlstopMoveStepoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
+<<<<<<< HEAD
     colorControl_stopMoveStep_commandParams.put(
         "optionsOverride", colorControl_stopMoveStep_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    colorControlstopMoveStepCommandParams.put(
+        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo colorControl_stopMoveStep_CommandInfo =
+    CommandInfo colorControlstopMoveStepCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11416,12 +11783,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            colorControl_stopMoveStep_commandParams);
-    colorControl_ClusterCommandInfo.put("stopMoveStep", colorControl_stopMoveStep_CommandInfo);
+            colorControlstopMoveStepCommandParams);
+    colorControlClusterCommandInfo.put("stopMoveStep", colorControlstopMoveStepCommandInfo);
     // Populate cluster
-    ClusterInfo colorControl_clusterInfo =
+    ClusterInfo colorControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
+<<<<<<< HEAD
             colorControl_ClusterCommandInfo);
     clusterMap.put("colorControl", colorControl_clusterInfo);
     Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
@@ -11439,24 +11807,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> contentLauncher_launchContent_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            colorControlClusterCommandInfo);
+    clusterMap.put("colorControl", colorControlClusterInfo);
+    Map<String, CommandInfo> contentLauncherClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> contentLauncherlaunchContentCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter contentLauncher_launchContent_commandParameter =
+    CommandParameter contentLauncherlaunchContentCommandParameter =
         new CommandParameter(
             "ContentLauncher",
             ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
-    CommandParameter contentLauncher_launchContent_autoPlay_commandParameter =
+    CommandParameter contentLauncherlaunchContentautoPlayCommandParameter =
         new CommandParameter("autoPlay", boolean.class);
-    contentLauncher_launchContent_commandParams.put(
-        "autoPlay", contentLauncher_launchContent_autoPlay_commandParameter);
+    contentLauncherlaunchContentCommandParams.put(
+        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameter);
 
-    CommandParameter contentLauncher_launchContent_data_commandParameter =
+    CommandParameter contentLauncherlaunchContentdataCommandParameter =
         new CommandParameter("data", String.class);
+<<<<<<< HEAD
     contentLauncher_launchContent_commandParams.put(
         "data", contentLauncher_launchContent_data_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    contentLauncherlaunchContentCommandParams.put(
+        "data", contentLauncherlaunchContentdataCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo contentLauncher_launchContent_CommandInfo =
+    CommandInfo contentLauncherlaunchContentCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11469,6 +11849,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("data"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             contentLauncher_launchContent_commandParams);
     contentLauncher_ClusterCommandInfo.put(
@@ -11487,23 +11868,35 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> contentLauncher_launchURL_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedLaunchContentResponseCallback(),
+            contentLauncherlaunchContentCommandParams);
+    contentLauncherClusterCommandInfo.put("launchContent", contentLauncherlaunchContentCommandInfo);
+    Map<String, CommandParameter> contentLauncherlaunchURLCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter contentLauncher_launchURL_commandParameter =
+    CommandParameter contentLauncherlaunchURLCommandParameter =
         new CommandParameter(
             "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
-    CommandParameter contentLauncher_launchURL_contentURL_commandParameter =
+    CommandParameter contentLauncherlaunchURLcontentURLCommandParameter =
         new CommandParameter("contentURL", String.class);
-    contentLauncher_launchURL_commandParams.put(
-        "contentURL", contentLauncher_launchURL_contentURL_commandParameter);
+    contentLauncherlaunchURLCommandParams.put(
+        "contentURL", contentLauncherlaunchURLcontentURLCommandParameter);
 
-    CommandParameter contentLauncher_launchURL_displayString_commandParameter =
+    CommandParameter contentLauncherlaunchURLdisplayStringCommandParameter =
         new CommandParameter("displayString", String.class);
+<<<<<<< HEAD
     contentLauncher_launchURL_commandParams.put(
         "displayString", contentLauncher_launchURL_displayString_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    contentLauncherlaunchURLCommandParams.put(
+        "displayString", contentLauncherlaunchURLdisplayStringCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo contentLauncher_launchURL_CommandInfo =
+    CommandInfo contentLauncherlaunchURLCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11516,20 +11909,21 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("displayString"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            contentLauncher_launchURL_commandParams);
-    contentLauncher_ClusterCommandInfo.put("launchURL", contentLauncher_launchURL_CommandInfo);
+            () -> new DelegatedLaunchURLResponseCallback(),
+            contentLauncherlaunchURLCommandParams);
+    contentLauncherClusterCommandInfo.put("launchURL", contentLauncherlaunchURLCommandInfo);
     // Populate cluster
-    ClusterInfo contentLauncher_clusterInfo =
+    ClusterInfo contentLauncherClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
-            contentLauncher_ClusterCommandInfo);
-    clusterMap.put("contentLauncher", contentLauncher_clusterInfo);
-    Map<String, CommandInfo> descriptor_ClusterCommandInfo = new HashMap<>();
+            contentLauncherClusterCommandInfo);
+    clusterMap.put("contentLauncher", contentLauncherClusterInfo);
+    Map<String, CommandInfo> descriptorClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo descriptor_clusterInfo =
+    ClusterInfo descriptorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
+<<<<<<< HEAD
             descriptor_ClusterCommandInfo);
     clusterMap.put("descriptor", descriptor_clusterInfo);
     Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
@@ -11554,28 +11948,39 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            descriptorClusterCommandInfo);
+    clusterMap.put("descriptor", descriptorClusterInfo);
+    Map<String, CommandInfo> diagnosticLogsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> diagnosticLogsretrieveLogsRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter diagnosticLogs_retrieveLogsRequest_commandParameter =
+    CommandParameter diagnosticLogsretrieveLogsRequestCommandParameter =
         new CommandParameter("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter diagnosticLogs_retrieveLogsRequest_intent_commandParameter =
+    CommandParameter diagnosticLogsretrieveLogsRequestintentCommandParameter =
         new CommandParameter("intent", int.class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.put(
-        "intent", diagnosticLogs_retrieveLogsRequest_intent_commandParameter);
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
+        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameter);
 
-    CommandParameter diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter =
+    CommandParameter diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameter =
         new CommandParameter("requestedProtocol", int.class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.put(
-        "requestedProtocol", diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter);
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
+        "requestedProtocol", diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameter);
 
-    CommandParameter diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter =
+    CommandParameter diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameter =
         new CommandParameter("transferFileDesignator", byte[].class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.put(
+    diagnosticLogsretrieveLogsRequestCommandParams.put(
         "transferFileDesignator",
+<<<<<<< HEAD
         diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo diagnosticLogs_retrieveLogsRequest_CommandInfo =
+    CommandInfo diagnosticLogsretrieveLogsRequestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11590,13 +11995,14 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            diagnosticLogs_retrieveLogsRequest_commandParams);
-    diagnosticLogs_ClusterCommandInfo.put(
-        "retrieveLogsRequest", diagnosticLogs_retrieveLogsRequest_CommandInfo);
+            diagnosticLogsretrieveLogsRequestCommandParams);
+    diagnosticLogsClusterCommandInfo.put(
+        "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestCommandInfo);
     // Populate cluster
-    ClusterInfo diagnosticLogs_clusterInfo =
+    ClusterInfo diagnosticLogsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId),
+<<<<<<< HEAD
             diagnosticLogs_ClusterCommandInfo);
     clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
     Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
@@ -11607,13 +12013,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearAllPins_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            diagnosticLogsClusterCommandInfo);
+    clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
+    Map<String, CommandInfo> doorLockClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> doorLockclearAllPinsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearAllPins_commandParameter =
+    CommandParameter doorLockclearAllPinsCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo doorLock_clearAllPins_CommandInfo =
+    CommandInfo doorLockclearAllPinsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11624,6 +12037,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearAllPins_commandParams);
     doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
@@ -11634,13 +12048,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearAllRfids_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearAllPinsResponseCallback(),
+            doorLockclearAllPinsCommandParams);
+    doorLockClusterCommandInfo.put("clearAllPins", doorLockclearAllPinsCommandInfo);
+    Map<String, CommandParameter> doorLockclearAllRfidsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearAllRfids_commandParameter =
+    CommandParameter doorLockclearAllRfidsCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo doorLock_clearAllRfids_CommandInfo =
+    CommandInfo doorLockclearAllRfidsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11651,6 +12072,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearAllRfids_commandParams);
     doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
@@ -11665,18 +12087,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearHolidaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearAllRfidsResponseCallback(),
+            doorLockclearAllRfidsCommandParams);
+    doorLockClusterCommandInfo.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
+    Map<String, CommandParameter> doorLockclearHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearHolidaySchedule_commandParameter =
+    CommandParameter doorLockclearHolidayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
-    CommandParameter doorLock_clearHolidaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockclearHolidaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
+<<<<<<< HEAD
     doorLock_clearHolidaySchedule_commandParams.put(
         "scheduleId", doorLock_clearHolidaySchedule_scheduleId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockclearHolidayScheduleCommandParams.put(
+        "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_clearHolidaySchedule_CommandInfo =
+    CommandInfo doorLockclearHolidayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11688,6 +12122,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("scheduleId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
@@ -11701,17 +12136,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearPin_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearHolidayScheduleResponseCallback(),
+            doorLockclearHolidayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockclearPinCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearPin_commandParameter =
+    CommandParameter doorLockclearPinCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
-    CommandParameter doorLock_clearPin_userId_commandParameter =
+    CommandParameter doorLockclearPinuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_clearPin_commandParams.put("userId", doorLock_clearPin_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_clearPin_CommandInfo =
+    CommandInfo doorLockclearPinCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11723,6 +12169,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearPin_commandParams);
     doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
@@ -11735,17 +12182,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearRfid_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearPinResponseCallback(),
+            doorLockclearPinCommandParams);
+    doorLockClusterCommandInfo.put("clearPin", doorLockclearPinCommandInfo);
+    Map<String, CommandParameter> doorLockclearRfidCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearRfid_commandParameter =
+    CommandParameter doorLockclearRfidCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
-    CommandParameter doorLock_clearRfid_userId_commandParameter =
+    CommandParameter doorLockclearRfiduserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_clearRfid_commandParams.put("userId", doorLock_clearRfid_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_clearRfid_CommandInfo =
+    CommandInfo doorLockclearRfidCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11757,6 +12215,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearRfid_commandParams);
     doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
@@ -11775,23 +12234,35 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearWeekdaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearRfidResponseCallback(),
+            doorLockclearRfidCommandParams);
+    doorLockClusterCommandInfo.put("clearRfid", doorLockclearRfidCommandInfo);
+    Map<String, CommandParameter> doorLockclearWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearWeekdaySchedule_commandParameter =
+    CommandParameter doorLockclearWeekdayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLock_clearWeekdaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockclearWeekdaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_clearWeekdaySchedule_commandParams.put(
-        "scheduleId", doorLock_clearWeekdaySchedule_scheduleId_commandParameter);
+    doorLockclearWeekdayScheduleCommandParams.put(
+        "scheduleId", doorLockclearWeekdaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_clearWeekdaySchedule_userId_commandParameter =
+    CommandParameter doorLockclearWeekdayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_clearWeekdaySchedule_commandParams.put(
         "userId", doorLock_clearWeekdaySchedule_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockclearWeekdayScheduleCommandParams.put(
+        "userId", doorLockclearWeekdayScheduleuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_clearWeekdaySchedule_CommandInfo =
+    CommandInfo doorLockclearWeekdayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11804,6 +12275,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
@@ -11823,23 +12295,35 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_clearYeardaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearWeekdayScheduleResponseCallback(),
+            doorLockclearWeekdayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockclearYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_clearYeardaySchedule_commandParameter =
+    CommandParameter doorLockclearYeardayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
-    CommandParameter doorLock_clearYeardaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockclearYeardaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_clearYeardaySchedule_commandParams.put(
-        "scheduleId", doorLock_clearYeardaySchedule_scheduleId_commandParameter);
+    doorLockclearYeardayScheduleCommandParams.put(
+        "scheduleId", doorLockclearYeardaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_clearYeardaySchedule_userId_commandParameter =
+    CommandParameter doorLockclearYeardayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_clearYeardaySchedule_commandParams.put(
         "userId", doorLock_clearYeardaySchedule_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockclearYeardayScheduleCommandParams.put(
+        "userId", doorLockclearYeardayScheduleuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_clearYeardaySchedule_CommandInfo =
+    CommandInfo doorLockclearYeardayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11852,6 +12336,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_clearYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put(
@@ -11866,18 +12351,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getHolidaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedClearYeardayScheduleResponseCallback(),
+            doorLockclearYeardayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockgetHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getHolidaySchedule_commandParameter =
+    CommandParameter doorLockgetHolidayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
-    CommandParameter doorLock_getHolidaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockgetHolidaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
+<<<<<<< HEAD
     doorLock_getHolidaySchedule_commandParams.put(
         "scheduleId", doorLock_getHolidaySchedule_scheduleId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetHolidayScheduleCommandParams.put(
+        "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getHolidaySchedule_CommandInfo =
+    CommandInfo doorLockgetHolidayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11889,6 +12386,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("scheduleId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
@@ -11902,18 +12400,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getLogRecord_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetHolidayScheduleResponseCallback(),
+            doorLockgetHolidayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockgetLogRecordCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getLogRecord_commandParameter =
+    CommandParameter doorLockgetLogRecordCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
-    CommandParameter doorLock_getLogRecord_logIndex_commandParameter =
+    CommandParameter doorLockgetLogRecordlogIndexCommandParameter =
         new CommandParameter("logIndex", int.class);
+<<<<<<< HEAD
     doorLock_getLogRecord_commandParams.put(
         "logIndex", doorLock_getLogRecord_logIndex_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetLogRecordCommandParams.put("logIndex", doorLockgetLogRecordlogIndexCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getLogRecord_CommandInfo =
+    CommandInfo doorLockgetLogRecordCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11925,6 +12434,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("logIndex"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getLogRecord_commandParams);
     doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
@@ -11937,16 +12447,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getPin_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetLogRecordResponseCallback(),
+            doorLockgetLogRecordCommandParams);
+    doorLockClusterCommandInfo.put("getLogRecord", doorLockgetLogRecordCommandInfo);
+    Map<String, CommandParameter> doorLockgetPinCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getPin_commandParameter =
+    CommandParameter doorLockgetPinCommandParameter =
         new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
-    CommandParameter doorLock_getPin_userId_commandParameter =
+    CommandParameter doorLockgetPinuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_getPin_commandParams.put("userId", doorLock_getPin_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getPin_CommandInfo =
+    CommandInfo doorLockgetPinCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11958,6 +12479,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getPin_commandParams);
     doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
@@ -11970,17 +12492,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getRfid_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetPinResponseCallback(),
+            doorLockgetPinCommandParams);
+    doorLockClusterCommandInfo.put("getPin", doorLockgetPinCommandInfo);
+    Map<String, CommandParameter> doorLockgetRfidCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getRfid_commandParameter =
+    CommandParameter doorLockgetRfidCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
-    CommandParameter doorLock_getRfid_userId_commandParameter =
+    CommandParameter doorLockgetRfiduserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_getRfid_commandParams.put("userId", doorLock_getRfid_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getRfid_CommandInfo =
+    CommandInfo doorLockgetRfidCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -11992,6 +12525,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getRfid_commandParams);
     doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
@@ -12005,17 +12539,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getUserType_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetRfidResponseCallback(),
+            doorLockgetRfidCommandParams);
+    doorLockClusterCommandInfo.put("getRfid", doorLockgetRfidCommandInfo);
+    Map<String, CommandParameter> doorLockgetUserTypeCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getUserType_commandParameter =
+    CommandParameter doorLockgetUserTypeCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
-    CommandParameter doorLock_getUserType_userId_commandParameter =
+    CommandParameter doorLockgetUserTypeuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_getUserType_commandParams.put("userId", doorLock_getUserType_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetUserTypeCommandParams.put("userId", doorLockgetUserTypeuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getUserType_CommandInfo =
+    CommandInfo doorLockgetUserTypeCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12027,6 +12572,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getUserType_commandParams);
     doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
@@ -12044,23 +12590,35 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getWeekdaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetUserTypeResponseCallback(),
+            doorLockgetUserTypeCommandParams);
+    doorLockClusterCommandInfo.put("getUserType", doorLockgetUserTypeCommandInfo);
+    Map<String, CommandParameter> doorLockgetWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getWeekdaySchedule_commandParameter =
+    CommandParameter doorLockgetWeekdayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLock_getWeekdaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockgetWeekdaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_getWeekdaySchedule_commandParams.put(
-        "scheduleId", doorLock_getWeekdaySchedule_scheduleId_commandParameter);
+    doorLockgetWeekdayScheduleCommandParams.put(
+        "scheduleId", doorLockgetWeekdaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_getWeekdaySchedule_userId_commandParameter =
+    CommandParameter doorLockgetWeekdayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_getWeekdaySchedule_commandParams.put(
         "userId", doorLock_getWeekdaySchedule_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetWeekdayScheduleCommandParams.put(
+        "userId", doorLockgetWeekdayScheduleuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getWeekdaySchedule_CommandInfo =
+    CommandInfo doorLockgetWeekdayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12073,6 +12631,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
@@ -12090,23 +12649,35 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_getYeardaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetWeekdayScheduleResponseCallback(),
+            doorLockgetWeekdayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockgetYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_getYeardaySchedule_commandParameter =
+    CommandParameter doorLockgetYeardayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
-    CommandParameter doorLock_getYeardaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLockgetYeardaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_getYeardaySchedule_commandParams.put(
-        "scheduleId", doorLock_getYeardaySchedule_scheduleId_commandParameter);
+    doorLockgetYeardayScheduleCommandParams.put(
+        "scheduleId", doorLockgetYeardaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_getYeardaySchedule_userId_commandParameter =
+    CommandParameter doorLockgetYeardayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
+<<<<<<< HEAD
     doorLock_getYeardaySchedule_commandParams.put(
         "userId", doorLock_getYeardaySchedule_userId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockgetYeardayScheduleCommandParams.put(
+        "userId", doorLockgetYeardayScheduleuserIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_getYeardaySchedule_CommandInfo =
+    CommandInfo doorLockgetYeardayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12119,6 +12690,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_getYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
@@ -12131,17 +12703,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_lockDoor_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetYeardayScheduleResponseCallback(),
+            doorLockgetYeardayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLocklockDoorCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_lockDoor_commandParameter =
+    CommandParameter doorLocklockDoorCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
-    CommandParameter doorLock_lockDoor_pin_commandParameter =
+    CommandParameter doorLocklockDoorpinCommandParameter =
         new CommandParameter("pin", byte[].class);
+<<<<<<< HEAD
     doorLock_lockDoor_commandParams.put("pin", doorLock_lockDoor_pin_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_lockDoor_CommandInfo =
+    CommandInfo doorLocklockDoorCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12153,6 +12736,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("pin"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_lockDoor_commandParams);
     doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
@@ -12180,34 +12764,45 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setHolidaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedLockDoorResponseCallback(),
+            doorLocklockDoorCommandParams);
+    doorLockClusterCommandInfo.put("lockDoor", doorLocklockDoorCommandInfo);
+    Map<String, CommandParameter> doorLocksetHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setHolidaySchedule_commandParameter =
+    CommandParameter doorLocksetHolidayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
-    CommandParameter doorLock_setHolidaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLocksetHolidaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setHolidaySchedule_commandParams.put(
-        "scheduleId", doorLock_setHolidaySchedule_scheduleId_commandParameter);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "scheduleId", doorLocksetHolidaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_setHolidaySchedule_localStartTime_commandParameter =
+    CommandParameter doorLocksetHolidaySchedulelocalStartTimeCommandParameter =
         new CommandParameter("localStartTime", long.class);
-    doorLock_setHolidaySchedule_commandParams.put(
-        "localStartTime", doorLock_setHolidaySchedule_localStartTime_commandParameter);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameter);
 
-    CommandParameter doorLock_setHolidaySchedule_localEndTime_commandParameter =
+    CommandParameter doorLocksetHolidaySchedulelocalEndTimeCommandParameter =
         new CommandParameter("localEndTime", long.class);
-    doorLock_setHolidaySchedule_commandParams.put(
-        "localEndTime", doorLock_setHolidaySchedule_localEndTime_commandParameter);
+    doorLocksetHolidayScheduleCommandParams.put(
+        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameter);
 
-    CommandParameter doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter =
+    CommandParameter doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameter =
         new CommandParameter("operatingModeDuringHoliday", int.class);
-    doorLock_setHolidaySchedule_commandParams.put(
+    doorLocksetHolidayScheduleCommandParams.put(
         "operatingModeDuringHoliday",
+<<<<<<< HEAD
         doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setHolidaySchedule_CommandInfo =
+    CommandInfo doorLocksetHolidayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12222,6 +12817,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("operatingModeDuringHoliday"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setHolidaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
@@ -12244,28 +12840,40 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setPin_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetHolidayScheduleResponseCallback(),
+            doorLocksetHolidayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLocksetPinCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setPin_commandParameter =
+    CommandParameter doorLocksetPinCommandParameter =
         new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
-    CommandParameter doorLock_setPin_userId_commandParameter =
+    CommandParameter doorLocksetPinuserIdCommandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setPin_commandParams.put("userId", doorLock_setPin_userId_commandParameter);
+    doorLocksetPinCommandParams.put("userId", doorLocksetPinuserIdCommandParameter);
 
-    CommandParameter doorLock_setPin_userStatus_commandParameter =
+    CommandParameter doorLocksetPinuserStatusCommandParameter =
         new CommandParameter("userStatus", int.class);
-    doorLock_setPin_commandParams.put("userStatus", doorLock_setPin_userStatus_commandParameter);
+    doorLocksetPinCommandParams.put("userStatus", doorLocksetPinuserStatusCommandParameter);
 
-    CommandParameter doorLock_setPin_userType_commandParameter =
+    CommandParameter doorLocksetPinuserTypeCommandParameter =
         new CommandParameter("userType", int.class);
-    doorLock_setPin_commandParams.put("userType", doorLock_setPin_userType_commandParameter);
+    doorLocksetPinCommandParams.put("userType", doorLocksetPinuserTypeCommandParameter);
 
+<<<<<<< HEAD
     CommandParameter doorLock_setPin_pin_commandParameter =
         new CommandParameter("pin", byte[].class);
     doorLock_setPin_commandParams.put("pin", doorLock_setPin_pin_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    CommandParameter doorLocksetPinpinCommandParameter = new CommandParameter("pin", byte[].class);
+    doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setPin_CommandInfo =
+    CommandInfo doorLocksetPinCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12280,6 +12888,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("pin"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setPin_commandParams);
     doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
@@ -12303,29 +12912,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setRfid_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetPinResponseCallback(),
+            doorLocksetPinCommandParams);
+    doorLockClusterCommandInfo.put("setPin", doorLocksetPinCommandInfo);
+    Map<String, CommandParameter> doorLocksetRfidCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setRfid_commandParameter =
+    CommandParameter doorLocksetRfidCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
-    CommandParameter doorLock_setRfid_userId_commandParameter =
+    CommandParameter doorLocksetRfiduserIdCommandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setRfid_commandParams.put("userId", doorLock_setRfid_userId_commandParameter);
+    doorLocksetRfidCommandParams.put("userId", doorLocksetRfiduserIdCommandParameter);
 
-    CommandParameter doorLock_setRfid_userStatus_commandParameter =
+    CommandParameter doorLocksetRfiduserStatusCommandParameter =
         new CommandParameter("userStatus", int.class);
-    doorLock_setRfid_commandParams.put("userStatus", doorLock_setRfid_userStatus_commandParameter);
+    doorLocksetRfidCommandParams.put("userStatus", doorLocksetRfiduserStatusCommandParameter);
 
-    CommandParameter doorLock_setRfid_userType_commandParameter =
+    CommandParameter doorLocksetRfiduserTypeCommandParameter =
         new CommandParameter("userType", int.class);
-    doorLock_setRfid_commandParams.put("userType", doorLock_setRfid_userType_commandParameter);
+    doorLocksetRfidCommandParams.put("userType", doorLocksetRfiduserTypeCommandParameter);
 
+<<<<<<< HEAD
     CommandParameter doorLock_setRfid_id_commandParameter =
         new CommandParameter("id", byte[].class);
     doorLock_setRfid_commandParams.put("id", doorLock_setRfid_id_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    CommandParameter doorLocksetRfididCommandParameter = new CommandParameter("id", byte[].class);
+    doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setRfid_CommandInfo =
+    CommandInfo doorLocksetRfidCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12340,6 +12961,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("id"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setRfid_commandParams);
     doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
@@ -12357,22 +12979,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setUserType_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetRfidResponseCallback(),
+            doorLocksetRfidCommandParams);
+    doorLockClusterCommandInfo.put("setRfid", doorLocksetRfidCommandInfo);
+    Map<String, CommandParameter> doorLocksetUserTypeCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setUserType_commandParameter =
+    CommandParameter doorLocksetUserTypeCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
-    CommandParameter doorLock_setUserType_userId_commandParameter =
+    CommandParameter doorLocksetUserTypeuserIdCommandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setUserType_commandParams.put("userId", doorLock_setUserType_userId_commandParameter);
+    doorLocksetUserTypeCommandParams.put("userId", doorLocksetUserTypeuserIdCommandParameter);
 
-    CommandParameter doorLock_setUserType_userType_commandParameter =
+    CommandParameter doorLocksetUserTypeuserTypeCommandParameter =
         new CommandParameter("userType", int.class);
+<<<<<<< HEAD
     doorLock_setUserType_commandParams.put(
         "userType", doorLock_setUserType_userType_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLocksetUserTypeCommandParams.put("userType", doorLocksetUserTypeuserTypeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setUserType_CommandInfo =
+    CommandInfo doorLocksetUserTypeCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12385,6 +13018,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("userType"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setUserType_commandParams);
     doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
@@ -12422,48 +13056,60 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setWeekdaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetUserTypeResponseCallback(),
+            doorLocksetUserTypeCommandParams);
+    doorLockClusterCommandInfo.put("setUserType", doorLocksetUserTypeCommandInfo);
+    Map<String, CommandParameter> doorLocksetWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setWeekdaySchedule_commandParameter =
+    CommandParameter doorLocksetWeekdayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLock_setWeekdaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLocksetWeekdaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "scheduleId", doorLock_setWeekdaySchedule_scheduleId_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "scheduleId", doorLocksetWeekdaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_userId_commandParameter =
+    CommandParameter doorLocksetWeekdayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "userId", doorLock_setWeekdaySchedule_userId_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "userId", doorLocksetWeekdayScheduleuserIdCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_daysMask_commandParameter =
+    CommandParameter doorLocksetWeekdayScheduledaysMaskCommandParameter =
         new CommandParameter("daysMask", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "daysMask", doorLock_setWeekdaySchedule_daysMask_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "daysMask", doorLocksetWeekdayScheduledaysMaskCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_startHour_commandParameter =
+    CommandParameter doorLocksetWeekdaySchedulestartHourCommandParameter =
         new CommandParameter("startHour", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "startHour", doorLock_setWeekdaySchedule_startHour_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "startHour", doorLocksetWeekdaySchedulestartHourCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_startMinute_commandParameter =
+    CommandParameter doorLocksetWeekdaySchedulestartMinuteCommandParameter =
         new CommandParameter("startMinute", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "startMinute", doorLock_setWeekdaySchedule_startMinute_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "startMinute", doorLocksetWeekdaySchedulestartMinuteCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_endHour_commandParameter =
+    CommandParameter doorLocksetWeekdayScheduleendHourCommandParameter =
         new CommandParameter("endHour", int.class);
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "endHour", doorLock_setWeekdaySchedule_endHour_commandParameter);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "endHour", doorLocksetWeekdayScheduleendHourCommandParameter);
 
-    CommandParameter doorLock_setWeekdaySchedule_endMinute_commandParameter =
+    CommandParameter doorLocksetWeekdayScheduleendMinuteCommandParameter =
         new CommandParameter("endMinute", int.class);
+<<<<<<< HEAD
     doorLock_setWeekdaySchedule_commandParams.put(
         "endMinute", doorLock_setWeekdaySchedule_endMinute_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setWeekdaySchedule_CommandInfo =
+    CommandInfo doorLocksetWeekdayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12481,6 +13127,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("endMinute"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setWeekdaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
@@ -12507,33 +13154,45 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_setYeardaySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetWeekdayScheduleResponseCallback(),
+            doorLocksetWeekdayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLocksetYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_setYeardaySchedule_commandParameter =
+    CommandParameter doorLocksetYeardayScheduleCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
-    CommandParameter doorLock_setYeardaySchedule_scheduleId_commandParameter =
+    CommandParameter doorLocksetYeardaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
-    doorLock_setYeardaySchedule_commandParams.put(
-        "scheduleId", doorLock_setYeardaySchedule_scheduleId_commandParameter);
+    doorLocksetYeardayScheduleCommandParams.put(
+        "scheduleId", doorLocksetYeardaySchedulescheduleIdCommandParameter);
 
-    CommandParameter doorLock_setYeardaySchedule_userId_commandParameter =
+    CommandParameter doorLocksetYeardayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
-    doorLock_setYeardaySchedule_commandParams.put(
-        "userId", doorLock_setYeardaySchedule_userId_commandParameter);
+    doorLocksetYeardayScheduleCommandParams.put(
+        "userId", doorLocksetYeardayScheduleuserIdCommandParameter);
 
-    CommandParameter doorLock_setYeardaySchedule_localStartTime_commandParameter =
+    CommandParameter doorLocksetYeardaySchedulelocalStartTimeCommandParameter =
         new CommandParameter("localStartTime", long.class);
-    doorLock_setYeardaySchedule_commandParams.put(
-        "localStartTime", doorLock_setYeardaySchedule_localStartTime_commandParameter);
+    doorLocksetYeardayScheduleCommandParams.put(
+        "localStartTime", doorLocksetYeardaySchedulelocalStartTimeCommandParameter);
 
-    CommandParameter doorLock_setYeardaySchedule_localEndTime_commandParameter =
+    CommandParameter doorLocksetYeardaySchedulelocalEndTimeCommandParameter =
         new CommandParameter("localEndTime", long.class);
+<<<<<<< HEAD
     doorLock_setYeardaySchedule_commandParams.put(
         "localEndTime", doorLock_setYeardaySchedule_localEndTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLocksetYeardayScheduleCommandParams.put(
+        "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_setYeardaySchedule_CommandInfo =
+    CommandInfo doorLocksetYeardayScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12548,6 +13207,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("localEndTime"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_setYeardaySchedule_commandParams);
     doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
@@ -12560,17 +13220,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_unlockDoor_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedSetYeardayScheduleResponseCallback(),
+            doorLocksetYeardayScheduleCommandParams);
+    doorLockClusterCommandInfo.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
+    Map<String, CommandParameter> doorLockunlockDoorCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_unlockDoor_commandParameter =
+    CommandParameter doorLockunlockDoorCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
-    CommandParameter doorLock_unlockDoor_pin_commandParameter =
+    CommandParameter doorLockunlockDoorpinCommandParameter =
         new CommandParameter("pin", byte[].class);
+<<<<<<< HEAD
     doorLock_unlockDoor_commandParams.put("pin", doorLock_unlockDoor_pin_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_unlockDoor_CommandInfo =
+    CommandInfo doorLockunlockDoorCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12582,6 +13253,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("pin"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             doorLock_unlockDoor_commandParams);
     doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
@@ -12600,23 +13272,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> doorLock_unlockWithTimeout_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedUnlockDoorResponseCallback(),
+            doorLockunlockDoorCommandParams);
+    doorLockClusterCommandInfo.put("unlockDoor", doorLockunlockDoorCommandInfo);
+    Map<String, CommandParameter> doorLockunlockWithTimeoutCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter doorLock_unlockWithTimeout_commandParameter =
+    CommandParameter doorLockunlockWithTimeoutCommandParameter =
         new CommandParameter(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
-    CommandParameter doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter =
+    CommandParameter doorLockunlockWithTimeouttimeoutInSecondsCommandParameter =
         new CommandParameter("timeoutInSeconds", int.class);
-    doorLock_unlockWithTimeout_commandParams.put(
-        "timeoutInSeconds", doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter);
+    doorLockunlockWithTimeoutCommandParams.put(
+        "timeoutInSeconds", doorLockunlockWithTimeouttimeoutInSecondsCommandParameter);
 
-    CommandParameter doorLock_unlockWithTimeout_pin_commandParameter =
+    CommandParameter doorLockunlockWithTimeoutpinCommandParameter =
         new CommandParameter("pin", byte[].class);
+<<<<<<< HEAD
     doorLock_unlockWithTimeout_commandParams.put(
         "pin", doorLock_unlockWithTimeout_pin_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    doorLockunlockWithTimeoutCommandParams.put("pin", doorLockunlockWithTimeoutpinCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo doorLock_unlockWithTimeout_CommandInfo =
+    CommandInfo doorLockunlockWithTimeoutCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12629,20 +13312,21 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("pin"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_unlockWithTimeout_commandParams);
-    doorLock_ClusterCommandInfo.put("unlockWithTimeout", doorLock_unlockWithTimeout_CommandInfo);
+            () -> new DelegatedUnlockWithTimeoutResponseCallback(),
+            doorLockunlockWithTimeoutCommandParams);
+    doorLockClusterCommandInfo.put("unlockWithTimeout", doorLockunlockWithTimeoutCommandInfo);
     // Populate cluster
-    ClusterInfo doorLock_clusterInfo =
+    ClusterInfo doorLockClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
-            doorLock_ClusterCommandInfo);
-    clusterMap.put("doorLock", doorLock_clusterInfo);
-    Map<String, CommandInfo> electricalMeasurement_ClusterCommandInfo = new HashMap<>();
+            doorLockClusterCommandInfo);
+    clusterMap.put("doorLock", doorLockClusterInfo);
+    Map<String, CommandInfo> electricalMeasurementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo electricalMeasurement_clusterInfo =
+    ClusterInfo electricalMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
             electricalMeasurement_ClusterCommandInfo);
     clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
     Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
@@ -12653,13 +13337,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            electricalMeasurementClusterCommandInfo);
+    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
+    Map<String, CommandInfo> ethernetNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> ethernetNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter ethernetNetworkDiagnostics_resetCounts_commandParameter =
+    CommandParameter ethernetNetworkDiagnosticsresetCountsCommandParameter =
         new CommandParameter(
             "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo ethernetNetworkDiagnostics_resetCounts_CommandInfo =
+    CommandInfo ethernetNetworkDiagnosticsresetCountsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12670,28 +13361,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            ethernetNetworkDiagnostics_resetCounts_commandParams);
-    ethernetNetworkDiagnostics_ClusterCommandInfo.put(
-        "resetCounts", ethernetNetworkDiagnostics_resetCounts_CommandInfo);
+            ethernetNetworkDiagnosticsresetCountsCommandParams);
+    ethernetNetworkDiagnosticsClusterCommandInfo.put(
+        "resetCounts", ethernetNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
-    ClusterInfo ethernetNetworkDiagnostics_clusterInfo =
+    ClusterInfo ethernetNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId),
-            ethernetNetworkDiagnostics_ClusterCommandInfo);
-    clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
-    Map<String, CommandInfo> fixedLabel_ClusterCommandInfo = new HashMap<>();
+            ethernetNetworkDiagnosticsClusterCommandInfo);
+    clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
+    Map<String, CommandInfo> fixedLabelClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo fixedLabel_clusterInfo =
+    ClusterInfo fixedLabelClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
-            fixedLabel_ClusterCommandInfo);
-    clusterMap.put("fixedLabel", fixedLabel_clusterInfo);
-    Map<String, CommandInfo> flowMeasurement_ClusterCommandInfo = new HashMap<>();
+            fixedLabelClusterCommandInfo);
+    clusterMap.put("fixedLabel", fixedLabelClusterInfo);
+    Map<String, CommandInfo> flowMeasurementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo flowMeasurement_clusterInfo =
+    ClusterInfo flowMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
             flowMeasurement_ClusterCommandInfo);
     clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
     Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
@@ -12714,30 +13406,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> generalCommissioning_armFailSafe_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            flowMeasurementClusterCommandInfo);
+    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
+    Map<String, CommandInfo> generalCommissioningClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> generalCommissioningarmFailSafeCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioning_armFailSafe_commandParameter =
+    CommandParameter generalCommissioningarmFailSafeCommandParameter =
         new CommandParameter(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
-    CommandParameter generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter =
+    CommandParameter generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameter =
         new CommandParameter("expiryLengthSeconds", int.class);
-    generalCommissioning_armFailSafe_commandParams.put(
-        "expiryLengthSeconds",
-        generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter);
+    generalCommissioningarmFailSafeCommandParams.put(
+        "expiryLengthSeconds", generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameter);
 
-    CommandParameter generalCommissioning_armFailSafe_breadcrumb_commandParameter =
+    CommandParameter generalCommissioningarmFailSafebreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_armFailSafe_commandParams.put(
-        "breadcrumb", generalCommissioning_armFailSafe_breadcrumb_commandParameter);
+    generalCommissioningarmFailSafeCommandParams.put(
+        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameter);
 
-    CommandParameter generalCommissioning_armFailSafe_timeoutMs_commandParameter =
+    CommandParameter generalCommissioningarmFailSafetimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     generalCommissioning_armFailSafe_commandParams.put(
         "timeoutMs", generalCommissioning_armFailSafe_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    generalCommissioningarmFailSafeCommandParams.put(
+        "timeoutMs", generalCommissioningarmFailSafetimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo generalCommissioning_armFailSafe_CommandInfo =
+    CommandInfo generalCommissioningarmFailSafeCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12752,6 +13455,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             generalCommissioning_armFailSafe_commandParams);
     generalCommissioning_ClusterCommandInfo.put(
@@ -12764,14 +13468,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> generalCommissioning_commissioningComplete_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedArmFailSafeResponseCallback(),
+            generalCommissioningarmFailSafeCommandParams);
+    generalCommissioningClusterCommandInfo.put(
+        "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
+    Map<String, CommandParameter> generalCommissioningcommissioningCompleteCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioning_commissioningComplete_commandParameter =
+    CommandParameter generalCommissioningcommissioningCompleteCommandParameter =
         new CommandParameter(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo generalCommissioning_commissioningComplete_CommandInfo =
+    CommandInfo generalCommissioningcommissioningCompleteCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12784,6 +13496,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                           callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             generalCommissioning_commissioningComplete_commandParams);
     generalCommissioning_ClusterCommandInfo.put(
@@ -12815,34 +13528,47 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedCommissioningCompleteResponseCallback(),
+            generalCommissioningcommissioningCompleteCommandParams);
+    generalCommissioningClusterCommandInfo.put(
+        "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
+    Map<String, CommandParameter> generalCommissioningsetRegulatoryConfigCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioning_setRegulatoryConfig_commandParameter =
+    CommandParameter generalCommissioningsetRegulatoryConfigCommandParameter =
         new CommandParameter(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
-    CommandParameter generalCommissioning_setRegulatoryConfig_location_commandParameter =
+    CommandParameter generalCommissioningsetRegulatoryConfiglocationCommandParameter =
         new CommandParameter("location", int.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.put(
-        "location", generalCommissioning_setRegulatoryConfig_location_commandParameter);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "location", generalCommissioningsetRegulatoryConfiglocationCommandParameter);
 
-    CommandParameter generalCommissioning_setRegulatoryConfig_countryCode_commandParameter =
+    CommandParameter generalCommissioningsetRegulatoryConfigcountryCodeCommandParameter =
         new CommandParameter("countryCode", String.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.put(
-        "countryCode", generalCommissioning_setRegulatoryConfig_countryCode_commandParameter);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameter);
 
-    CommandParameter generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter =
+    CommandParameter generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.put(
-        "breadcrumb", generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameter);
 
-    CommandParameter generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter =
+    CommandParameter generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     generalCommissioning_setRegulatoryConfig_commandParams.put(
         "timeoutMs", generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "timeoutMs", generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo generalCommissioning_setRegulatoryConfig_CommandInfo =
+    CommandInfo generalCommissioningsetRegulatoryConfigCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12858,28 +13584,29 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            generalCommissioning_setRegulatoryConfig_commandParams);
-    generalCommissioning_ClusterCommandInfo.put(
-        "setRegulatoryConfig", generalCommissioning_setRegulatoryConfig_CommandInfo);
+            () -> new DelegatedSetRegulatoryConfigResponseCallback(),
+            generalCommissioningsetRegulatoryConfigCommandParams);
+    generalCommissioningClusterCommandInfo.put(
+        "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigCommandInfo);
     // Populate cluster
-    ClusterInfo generalCommissioning_clusterInfo =
+    ClusterInfo generalCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
-            generalCommissioning_ClusterCommandInfo);
-    clusterMap.put("generalCommissioning", generalCommissioning_clusterInfo);
-    Map<String, CommandInfo> generalDiagnostics_ClusterCommandInfo = new HashMap<>();
+            generalCommissioningClusterCommandInfo);
+    clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
+    Map<String, CommandInfo> generalDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo generalDiagnostics_clusterInfo =
+    ClusterInfo generalDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
-            generalDiagnostics_ClusterCommandInfo);
-    clusterMap.put("generalDiagnostics", generalDiagnostics_clusterInfo);
-    Map<String, CommandInfo> groupKeyManagement_ClusterCommandInfo = new HashMap<>();
+            generalDiagnosticsClusterCommandInfo);
+    clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
+    Map<String, CommandInfo> groupKeyManagementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo groupKeyManagement_clusterInfo =
+    ClusterInfo groupKeyManagementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId),
+<<<<<<< HEAD
             groupKeyManagement_ClusterCommandInfo);
     clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
     Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
@@ -12896,20 +13623,31 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_addGroup_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            groupKeyManagementClusterCommandInfo);
+    clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
+    Map<String, CommandInfo> groupsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> groupsaddGroupCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_addGroup_commandParameter =
+    CommandParameter groupsaddGroupCommandParameter =
         new CommandParameter("Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
-    CommandParameter groups_addGroup_groupId_commandParameter =
+    CommandParameter groupsaddGroupgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    groups_addGroup_commandParams.put("groupId", groups_addGroup_groupId_commandParameter);
+    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameter);
 
-    CommandParameter groups_addGroup_groupName_commandParameter =
+    CommandParameter groupsaddGroupgroupNameCommandParameter =
         new CommandParameter("groupName", String.class);
+<<<<<<< HEAD
     groups_addGroup_commandParams.put("groupName", groups_addGroup_groupName_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo groups_addGroup_CommandInfo =
+    CommandInfo groupsaddGroupCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12922,6 +13660,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("groupName"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             groups_addGroup_commandParams);
     groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
@@ -12940,22 +13679,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_addGroupIfIdentifying_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedAddGroupResponseCallback(),
+            groupsaddGroupCommandParams);
+    groupsClusterCommandInfo.put("addGroup", groupsaddGroupCommandInfo);
+    Map<String, CommandParameter> groupsaddGroupIfIdentifyingCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_addGroupIfIdentifying_commandParameter =
+    CommandParameter groupsaddGroupIfIdentifyingCommandParameter =
         new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter groups_addGroupIfIdentifying_groupId_commandParameter =
+    CommandParameter groupsaddGroupIfIdentifyinggroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    groups_addGroupIfIdentifying_commandParams.put(
-        "groupId", groups_addGroupIfIdentifying_groupId_commandParameter);
+    groupsaddGroupIfIdentifyingCommandParams.put(
+        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameter);
 
-    CommandParameter groups_addGroupIfIdentifying_groupName_commandParameter =
+    CommandParameter groupsaddGroupIfIdentifyinggroupNameCommandParameter =
         new CommandParameter("groupName", String.class);
+<<<<<<< HEAD
     groups_addGroupIfIdentifying_commandParams.put(
         "groupName", groups_addGroupIfIdentifying_groupName_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsaddGroupIfIdentifyingCommandParams.put(
+        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo groups_addGroupIfIdentifying_CommandInfo =
+    CommandInfo groupsaddGroupIfIdentifyingCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -12969,6 +13720,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             groups_addGroupIfIdentifying_commandParams);
     groups_ClusterCommandInfo.put(
         "addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
@@ -12986,23 +13738,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_getGroupMembership_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            groupsaddGroupIfIdentifyingCommandParams);
+    groupsClusterCommandInfo.put("addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
+    Map<String, CommandParameter> groupsgetGroupMembershipCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_getGroupMembership_commandParameter =
+    CommandParameter groupsgetGroupMembershipCommandParameter =
         new CommandParameter(
             "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
-    CommandParameter groups_getGroupMembership_groupCount_commandParameter =
+    CommandParameter groupsgetGroupMembershipgroupCountCommandParameter =
         new CommandParameter("groupCount", int.class);
-    groups_getGroupMembership_commandParams.put(
-        "groupCount", groups_getGroupMembership_groupCount_commandParameter);
+    groupsgetGroupMembershipCommandParams.put(
+        "groupCount", groupsgetGroupMembershipgroupCountCommandParameter);
 
-    CommandParameter groups_getGroupMembership_groupList_commandParameter =
+    CommandParameter groupsgetGroupMembershipgroupListCommandParameter =
         new CommandParameter("groupList", int.class);
+<<<<<<< HEAD
     groups_getGroupMembership_commandParams.put(
         "groupList", groups_getGroupMembership_groupList_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsgetGroupMembershipCommandParams.put(
+        "groupList", groupsgetGroupMembershipgroupListCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo groups_getGroupMembership_CommandInfo =
+    CommandInfo groupsgetGroupMembershipCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13015,6 +13778,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("groupList"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             groups_getGroupMembership_commandParams);
     groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
@@ -13025,12 +13789,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_removeAllGroups_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetGroupMembershipResponseCallback(),
+            groupsgetGroupMembershipCommandParams);
+    groupsClusterCommandInfo.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
+    Map<String, CommandParameter> groupsremoveAllGroupsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_removeAllGroups_commandParameter =
+    CommandParameter groupsremoveAllGroupsCommandParameter =
         new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo groups_removeAllGroups_CommandInfo =
+    CommandInfo groupsremoveAllGroupsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13041,6 +13812,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             groups_removeAllGroups_commandParams);
     groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
 <<<<<<< HEAD
@@ -13053,17 +13825,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_removeGroup_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            groupsremoveAllGroupsCommandParams);
+    groupsClusterCommandInfo.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
+    Map<String, CommandParameter> groupsremoveGroupCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_removeGroup_commandParameter =
+    CommandParameter groupsremoveGroupCommandParameter =
         new CommandParameter(
             "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
-    CommandParameter groups_removeGroup_groupId_commandParameter =
+    CommandParameter groupsremoveGroupgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
+<<<<<<< HEAD
     groups_removeGroup_commandParams.put("groupId", groups_removeGroup_groupId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo groups_removeGroup_CommandInfo =
+    CommandInfo groupsremoveGroupCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13075,6 +13857,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("groupId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             groups_removeGroup_commandParams);
     groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
@@ -13088,16 +13871,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> groups_viewGroup_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedRemoveGroupResponseCallback(),
+            groupsremoveGroupCommandParams);
+    groupsClusterCommandInfo.put("removeGroup", groupsremoveGroupCommandInfo);
+    Map<String, CommandParameter> groupsviewGroupCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter groups_viewGroup_commandParameter =
+    CommandParameter groupsviewGroupCommandParameter =
         new CommandParameter("Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
-    CommandParameter groups_viewGroup_groupId_commandParameter =
+    CommandParameter groupsviewGroupgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
+<<<<<<< HEAD
     groups_viewGroup_commandParams.put("groupId", groups_viewGroup_groupId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo groups_viewGroup_CommandInfo =
+    CommandInfo groupsviewGroupCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13109,13 +13903,14 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("groupId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            groups_viewGroup_commandParams);
-    groups_ClusterCommandInfo.put("viewGroup", groups_viewGroup_CommandInfo);
+            () -> new DelegatedViewGroupResponseCallback(),
+            groupsviewGroupCommandParams);
+    groupsClusterCommandInfo.put("viewGroup", groupsviewGroupCommandInfo);
     // Populate cluster
-    ClusterInfo groups_clusterInfo =
+    ClusterInfo groupsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId),
+<<<<<<< HEAD
             groups_ClusterCommandInfo);
     clusterMap.put("groups", groups_clusterInfo);
     Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
@@ -13129,17 +13924,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> identify_identify_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            groupsClusterCommandInfo);
+    clusterMap.put("groups", groupsClusterInfo);
+    Map<String, CommandInfo> identifyClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> identifyidentifyCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter identify_identify_commandParameter =
+    CommandParameter identifyidentifyCommandParameter =
         new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter identify_identify_identifyTime_commandParameter =
+    CommandParameter identifyidentifyidentifyTimeCommandParameter =
         new CommandParameter("identifyTime", int.class);
+<<<<<<< HEAD
     identify_identify_commandParams.put(
         "identifyTime", identify_identify_identifyTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    identifyidentifyCommandParams.put("identifyTime", identifyidentifyidentifyTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo identify_identify_CommandInfo =
+    CommandInfo identifyidentifyCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13152,6 +13958,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             identify_identify_commandParams);
     identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
 <<<<<<< HEAD
@@ -13161,13 +13968,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> identify_identifyQuery_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            identifyidentifyCommandParams);
+    identifyClusterCommandInfo.put("identify", identifyidentifyCommandInfo);
+    Map<String, CommandParameter> identifyidentifyQueryCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter identify_identifyQuery_commandParameter =
+    CommandParameter identifyidentifyQueryCommandParameter =
         new CommandParameter(
             "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo identify_identifyQuery_CommandInfo =
+    CommandInfo identifyidentifyQueryCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13178,6 +13991,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             identify_identifyQuery_commandParams);
     identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
@@ -13195,22 +14009,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> identify_triggerEffect_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedIdentifyQueryResponseCallback(),
+            identifyidentifyQueryCommandParams);
+    identifyClusterCommandInfo.put("identifyQuery", identifyidentifyQueryCommandInfo);
+    Map<String, CommandParameter> identifytriggerEffectCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter identify_triggerEffect_commandParameter =
+    CommandParameter identifytriggerEffectCommandParameter =
         new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter identify_triggerEffect_effectIdentifier_commandParameter =
+    CommandParameter identifytriggerEffecteffectIdentifierCommandParameter =
         new CommandParameter("effectIdentifier", int.class);
-    identify_triggerEffect_commandParams.put(
-        "effectIdentifier", identify_triggerEffect_effectIdentifier_commandParameter);
+    identifytriggerEffectCommandParams.put(
+        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameter);
 
-    CommandParameter identify_triggerEffect_effectVariant_commandParameter =
+    CommandParameter identifytriggerEffecteffectVariantCommandParameter =
         new CommandParameter("effectVariant", int.class);
+<<<<<<< HEAD
     identify_triggerEffect_commandParams.put(
         "effectVariant", identify_triggerEffect_effectVariant_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    identifytriggerEffectCommandParams.put(
+        "effectVariant", identifytriggerEffecteffectVariantCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo identify_triggerEffect_CommandInfo =
+    CommandInfo identifytriggerEffectCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13224,12 +14050,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            identify_triggerEffect_commandParams);
-    identify_ClusterCommandInfo.put("triggerEffect", identify_triggerEffect_CommandInfo);
+            identifytriggerEffectCommandParams);
+    identifyClusterCommandInfo.put("triggerEffect", identifytriggerEffectCommandInfo);
     // Populate cluster
-    ClusterInfo identify_clusterInfo =
+    ClusterInfo identifyClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
+<<<<<<< HEAD
             identify_ClusterCommandInfo);
     clusterMap.put("identify", identify_clusterInfo);
     Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
@@ -13242,17 +14069,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> keypadInput_sendKey_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            identifyClusterCommandInfo);
+    clusterMap.put("identify", identifyClusterInfo);
+    Map<String, CommandInfo> keypadInputClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> keypadInputsendKeyCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter keypadInput_sendKey_commandParameter =
+    CommandParameter keypadInputsendKeyCommandParameter =
         new CommandParameter(
             "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
-    CommandParameter keypadInput_sendKey_keyCode_commandParameter =
+    CommandParameter keypadInputsendKeykeyCodeCommandParameter =
         new CommandParameter("keyCode", int.class);
+<<<<<<< HEAD
     keypadInput_sendKey_commandParams.put("keyCode", keypadInput_sendKey_keyCode_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo keypadInput_sendKey_CommandInfo =
+    CommandInfo keypadInputsendKeyCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13264,13 +14102,14 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("keyCode"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            keypadInput_sendKey_commandParams);
-    keypadInput_ClusterCommandInfo.put("sendKey", keypadInput_sendKey_CommandInfo);
+            () -> new DelegatedSendKeyResponseCallback(),
+            keypadInputsendKeyCommandParams);
+    keypadInputClusterCommandInfo.put("sendKey", keypadInputsendKeyCommandInfo);
     // Populate cluster
-    ClusterInfo keypadInput_clusterInfo =
+    ClusterInfo keypadInputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
+<<<<<<< HEAD
             keypadInput_ClusterCommandInfo);
     clusterMap.put("keypadInput", keypadInput_clusterInfo);
     Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
@@ -13294,30 +14133,40 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_move_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            keypadInputClusterCommandInfo);
+    clusterMap.put("keypadInput", keypadInputClusterInfo);
+    Map<String, CommandInfo> levelControlClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> levelControlmoveCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_move_commandParameter =
+    CommandParameter levelControlmoveCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_move_moveMode_commandParameter =
+    CommandParameter levelControlmovemoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    levelControl_move_commandParams.put("moveMode", levelControl_move_moveMode_commandParameter);
+    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameter);
 
-    CommandParameter levelControl_move_rate_commandParameter =
-        new CommandParameter("rate", int.class);
-    levelControl_move_commandParams.put("rate", levelControl_move_rate_commandParameter);
+    CommandParameter levelControlmoverateCommandParameter = new CommandParameter("rate", int.class);
+    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameter);
 
-    CommandParameter levelControl_move_optionMask_commandParameter =
+    CommandParameter levelControlmoveoptionMaskCommandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_move_commandParams.put(
-        "optionMask", levelControl_move_optionMask_commandParameter);
+    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameter);
 
-    CommandParameter levelControl_move_optionOverride_commandParameter =
+    CommandParameter levelControlmoveoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
+<<<<<<< HEAD
     levelControl_move_commandParams.put(
         "optionOverride", levelControl_move_optionOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlmoveCommandParams.put(
+        "optionOverride", levelControlmoveoptionOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_move_CommandInfo =
+    CommandInfo levelControlmoveCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13333,6 +14182,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_move_commandParams);
     levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
 <<<<<<< HEAD
@@ -13356,32 +14206,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_moveToLevel_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlmoveCommandParams);
+    levelControlClusterCommandInfo.put("move", levelControlmoveCommandInfo);
+    Map<String, CommandParameter> levelControlmoveToLevelCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_moveToLevel_commandParameter =
+    CommandParameter levelControlmoveToLevelCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_moveToLevel_level_commandParameter =
+    CommandParameter levelControlmoveToLevellevelCommandParameter =
         new CommandParameter("level", int.class);
-    levelControl_moveToLevel_commandParams.put(
-        "level", levelControl_moveToLevel_level_commandParameter);
+    levelControlmoveToLevelCommandParams.put("level", levelControlmoveToLevellevelCommandParameter);
 
-    CommandParameter levelControl_moveToLevel_transitionTime_commandParameter =
+    CommandParameter levelControlmoveToLeveltransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_moveToLevel_commandParams.put(
-        "transitionTime", levelControl_moveToLevel_transitionTime_commandParameter);
+    levelControlmoveToLevelCommandParams.put(
+        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameter);
 
-    CommandParameter levelControl_moveToLevel_optionMask_commandParameter =
+    CommandParameter levelControlmoveToLeveloptionMaskCommandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_moveToLevel_commandParams.put(
-        "optionMask", levelControl_moveToLevel_optionMask_commandParameter);
+    levelControlmoveToLevelCommandParams.put(
+        "optionMask", levelControlmoveToLeveloptionMaskCommandParameter);
 
-    CommandParameter levelControl_moveToLevel_optionOverride_commandParameter =
+    CommandParameter levelControlmoveToLeveloptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
+<<<<<<< HEAD
     levelControl_moveToLevel_commandParams.put(
         "optionOverride", levelControl_moveToLevel_optionOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlmoveToLevelCommandParams.put(
+        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_moveToLevel_CommandInfo =
+    CommandInfo levelControlmoveToLevelCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13397,6 +14257,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_moveToLevel_commandParams);
     levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
 <<<<<<< HEAD
@@ -13415,22 +14276,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_moveToLevelWithOnOff_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlmoveToLevelCommandParams);
+    levelControlClusterCommandInfo.put("moveToLevel", levelControlmoveToLevelCommandInfo);
+    Map<String, CommandParameter> levelControlmoveToLevelWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_moveToLevelWithOnOff_commandParameter =
+    CommandParameter levelControlmoveToLevelWithOnOffCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_moveToLevelWithOnOff_level_commandParameter =
+    CommandParameter levelControlmoveToLevelWithOnOfflevelCommandParameter =
         new CommandParameter("level", int.class);
-    levelControl_moveToLevelWithOnOff_commandParams.put(
-        "level", levelControl_moveToLevelWithOnOff_level_commandParameter);
+    levelControlmoveToLevelWithOnOffCommandParams.put(
+        "level", levelControlmoveToLevelWithOnOfflevelCommandParameter);
 
-    CommandParameter levelControl_moveToLevelWithOnOff_transitionTime_commandParameter =
+    CommandParameter levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
+<<<<<<< HEAD
     levelControl_moveToLevelWithOnOff_commandParams.put(
         "transitionTime", levelControl_moveToLevelWithOnOff_transitionTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlmoveToLevelWithOnOffCommandParams.put(
+        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_moveToLevelWithOnOff_CommandInfo =
+    CommandInfo levelControlmoveToLevelWithOnOffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13444,6 +14316,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_moveToLevelWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put(
         "moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
@@ -13460,22 +14333,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_moveWithOnOff_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlmoveToLevelWithOnOffCommandParams);
+    levelControlClusterCommandInfo.put(
+        "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
+    Map<String, CommandParameter> levelControlmoveWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_moveWithOnOff_commandParameter =
+    CommandParameter levelControlmoveWithOnOffCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_moveWithOnOff_moveMode_commandParameter =
+    CommandParameter levelControlmoveWithOnOffmoveModeCommandParameter =
         new CommandParameter("moveMode", int.class);
-    levelControl_moveWithOnOff_commandParams.put(
-        "moveMode", levelControl_moveWithOnOff_moveMode_commandParameter);
+    levelControlmoveWithOnOffCommandParams.put(
+        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameter);
 
-    CommandParameter levelControl_moveWithOnOff_rate_commandParameter =
+    CommandParameter levelControlmoveWithOnOffrateCommandParameter =
         new CommandParameter("rate", int.class);
+<<<<<<< HEAD
     levelControl_moveWithOnOff_commandParams.put(
         "rate", levelControl_moveWithOnOff_rate_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlmoveWithOnOffCommandParams.put(
+        "rate", levelControlmoveWithOnOffrateCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_moveWithOnOff_CommandInfo =
+    CommandInfo levelControlmoveWithOnOffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13489,6 +14374,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_moveWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
 <<<<<<< HEAD
@@ -13515,35 +14401,45 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_step_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlmoveWithOnOffCommandParams);
+    levelControlClusterCommandInfo.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
+    Map<String, CommandParameter> levelControlstepCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_step_commandParameter =
+    CommandParameter levelControlstepCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_step_stepMode_commandParameter =
+    CommandParameter levelControlstepstepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    levelControl_step_commandParams.put("stepMode", levelControl_step_stepMode_commandParameter);
+    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameter);
 
-    CommandParameter levelControl_step_stepSize_commandParameter =
+    CommandParameter levelControlstepstepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    levelControl_step_commandParams.put("stepSize", levelControl_step_stepSize_commandParameter);
+    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameter);
 
-    CommandParameter levelControl_step_transitionTime_commandParameter =
+    CommandParameter levelControlsteptransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    levelControl_step_commandParams.put(
-        "transitionTime", levelControl_step_transitionTime_commandParameter);
+    levelControlstepCommandParams.put(
+        "transitionTime", levelControlsteptransitionTimeCommandParameter);
 
-    CommandParameter levelControl_step_optionMask_commandParameter =
+    CommandParameter levelControlstepoptionMaskCommandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_step_commandParams.put(
-        "optionMask", levelControl_step_optionMask_commandParameter);
+    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameter);
 
-    CommandParameter levelControl_step_optionOverride_commandParameter =
+    CommandParameter levelControlstepoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
+<<<<<<< HEAD
     levelControl_step_commandParams.put(
         "optionOverride", levelControl_step_optionOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlstepCommandParams.put(
+        "optionOverride", levelControlstepoptionOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_step_CommandInfo =
+    CommandInfo levelControlstepCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13560,6 +14456,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_step_commandParams);
     levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
 <<<<<<< HEAD
@@ -13580,27 +14477,38 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_stepWithOnOff_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlstepCommandParams);
+    levelControlClusterCommandInfo.put("step", levelControlstepCommandInfo);
+    Map<String, CommandParameter> levelControlstepWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_stepWithOnOff_commandParameter =
+    CommandParameter levelControlstepWithOnOffCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_stepWithOnOff_stepMode_commandParameter =
+    CommandParameter levelControlstepWithOnOffstepModeCommandParameter =
         new CommandParameter("stepMode", int.class);
-    levelControl_stepWithOnOff_commandParams.put(
-        "stepMode", levelControl_stepWithOnOff_stepMode_commandParameter);
+    levelControlstepWithOnOffCommandParams.put(
+        "stepMode", levelControlstepWithOnOffstepModeCommandParameter);
 
-    CommandParameter levelControl_stepWithOnOff_stepSize_commandParameter =
+    CommandParameter levelControlstepWithOnOffstepSizeCommandParameter =
         new CommandParameter("stepSize", int.class);
-    levelControl_stepWithOnOff_commandParams.put(
-        "stepSize", levelControl_stepWithOnOff_stepSize_commandParameter);
+    levelControlstepWithOnOffCommandParams.put(
+        "stepSize", levelControlstepWithOnOffstepSizeCommandParameter);
 
-    CommandParameter levelControl_stepWithOnOff_transitionTime_commandParameter =
+    CommandParameter levelControlstepWithOnOfftransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
+<<<<<<< HEAD
     levelControl_stepWithOnOff_commandParams.put(
         "transitionTime", levelControl_stepWithOnOff_transitionTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlstepWithOnOffCommandParams.put(
+        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_stepWithOnOff_CommandInfo =
+    CommandInfo levelControlstepWithOnOffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13615,6 +14523,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_stepWithOnOff_commandParams);
     levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
 <<<<<<< HEAD
@@ -13631,22 +14540,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_stop_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlstepWithOnOffCommandParams);
+    levelControlClusterCommandInfo.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
+    Map<String, CommandParameter> levelControlstopCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_stop_commandParameter =
+    CommandParameter levelControlstopCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControl_stop_optionMask_commandParameter =
+    CommandParameter levelControlstopoptionMaskCommandParameter =
         new CommandParameter("optionMask", int.class);
-    levelControl_stop_commandParams.put(
-        "optionMask", levelControl_stop_optionMask_commandParameter);
+    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameter);
 
-    CommandParameter levelControl_stop_optionOverride_commandParameter =
+    CommandParameter levelControlstopoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
+<<<<<<< HEAD
     levelControl_stop_commandParams.put(
         "optionOverride", levelControl_stop_optionOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlstopCommandParams.put(
+        "optionOverride", levelControlstopoptionOverrideCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo levelControl_stop_CommandInfo =
+    CommandInfo levelControlstopCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13660,6 +14579,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             levelControl_stop_commandParams);
     levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
 <<<<<<< HEAD
@@ -13669,12 +14589,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> levelControl_stopWithOnOff_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlstopCommandParams);
+    levelControlClusterCommandInfo.put("stop", levelControlstopCommandInfo);
+    Map<String, CommandParameter> levelControlstopWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter levelControl_stopWithOnOff_commandParameter =
+    CommandParameter levelControlstopWithOnOffCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo levelControl_stopWithOnOff_CommandInfo =
+    CommandInfo levelControlstopWithOnOffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13685,12 +14611,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            levelControl_stopWithOnOff_commandParams);
-    levelControl_ClusterCommandInfo.put("stopWithOnOff", levelControl_stopWithOnOff_CommandInfo);
+            levelControlstopWithOnOffCommandParams);
+    levelControlClusterCommandInfo.put("stopWithOnOff", levelControlstopWithOnOffCommandInfo);
     // Populate cluster
-    ClusterInfo levelControl_clusterInfo =
+    ClusterInfo levelControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
+<<<<<<< HEAD
             levelControl_ClusterCommandInfo);
     clusterMap.put("levelControl", levelControl_clusterInfo);
     Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
@@ -13701,12 +14628,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> lowPower_sleep_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            levelControlClusterCommandInfo);
+    clusterMap.put("levelControl", levelControlClusterInfo);
+    Map<String, CommandInfo> lowPowerClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> lowPowersleepCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter lowPower_sleep_commandParameter =
+    CommandParameter lowPowersleepCommandParameter =
         new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo lowPower_sleep_CommandInfo =
+    CommandInfo lowPowersleepCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13716,12 +14650,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            lowPower_sleep_commandParams);
-    lowPower_ClusterCommandInfo.put("sleep", lowPower_sleep_CommandInfo);
+            lowPowersleepCommandParams);
+    lowPowerClusterCommandInfo.put("sleep", lowPowersleepCommandInfo);
     // Populate cluster
-    ClusterInfo lowPower_clusterInfo =
+    ClusterInfo lowPowerClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
+<<<<<<< HEAD
             lowPower_ClusterCommandInfo);
     clusterMap.put("lowPower", lowPower_clusterInfo);
     Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
@@ -13732,12 +14667,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaInput_hideInputStatus_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            lowPowerClusterCommandInfo);
+    clusterMap.put("lowPower", lowPowerClusterInfo);
+    Map<String, CommandInfo> mediaInputClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> mediaInputhideInputStatusCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaInput_hideInputStatus_commandParameter =
+    CommandParameter mediaInputhideInputStatusCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaInput_hideInputStatus_CommandInfo =
+    CommandInfo mediaInputhideInputStatusCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13748,6 +14690,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             mediaInput_hideInputStatus_commandParams);
     mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
 <<<<<<< HEAD
@@ -13762,21 +14705,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaInput_renameInput_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            mediaInputhideInputStatusCommandParams);
+    mediaInputClusterCommandInfo.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
+    Map<String, CommandParameter> mediaInputrenameInputCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaInput_renameInput_commandParameter =
+    CommandParameter mediaInputrenameInputCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter mediaInput_renameInput_index_commandParameter =
+    CommandParameter mediaInputrenameInputindexCommandParameter =
         new CommandParameter("index", int.class);
-    mediaInput_renameInput_commandParams.put(
-        "index", mediaInput_renameInput_index_commandParameter);
+    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameter);
 
-    CommandParameter mediaInput_renameInput_name_commandParameter =
+    CommandParameter mediaInputrenameInputnameCommandParameter =
         new CommandParameter("name", String.class);
+<<<<<<< HEAD
     mediaInput_renameInput_commandParams.put("name", mediaInput_renameInput_name_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo mediaInput_renameInput_CommandInfo =
+    CommandInfo mediaInputrenameInputCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13790,6 +14742,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             mediaInput_renameInput_commandParams);
     mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
 <<<<<<< HEAD
@@ -13801,17 +14754,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaInput_selectInput_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            mediaInputrenameInputCommandParams);
+    mediaInputClusterCommandInfo.put("renameInput", mediaInputrenameInputCommandInfo);
+    Map<String, CommandParameter> mediaInputselectInputCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaInput_selectInput_commandParameter =
+    CommandParameter mediaInputselectInputCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter mediaInput_selectInput_index_commandParameter =
+    CommandParameter mediaInputselectInputindexCommandParameter =
         new CommandParameter("index", int.class);
+<<<<<<< HEAD
     mediaInput_selectInput_commandParams.put(
         "index", mediaInput_selectInput_index_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo mediaInput_selectInput_CommandInfo =
+    CommandInfo mediaInputselectInputCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13823,6 +14786,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             mediaInput_selectInput_commandParams);
     mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
 <<<<<<< HEAD
@@ -13832,12 +14796,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaInput_showInputStatus_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            mediaInputselectInputCommandParams);
+    mediaInputClusterCommandInfo.put("selectInput", mediaInputselectInputCommandInfo);
+    Map<String, CommandParameter> mediaInputshowInputStatusCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaInput_showInputStatus_commandParameter =
+    CommandParameter mediaInputshowInputStatusCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaInput_showInputStatus_CommandInfo =
+    CommandInfo mediaInputshowInputStatusCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13848,12 +14818,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            mediaInput_showInputStatus_commandParams);
-    mediaInput_ClusterCommandInfo.put("showInputStatus", mediaInput_showInputStatus_CommandInfo);
+            mediaInputshowInputStatusCommandParams);
+    mediaInputClusterCommandInfo.put("showInputStatus", mediaInputshowInputStatusCommandInfo);
     // Populate cluster
-    ClusterInfo mediaInput_clusterInfo =
+    ClusterInfo mediaInputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
+<<<<<<< HEAD
             mediaInput_ClusterCommandInfo);
     clusterMap.put("mediaInput", mediaInput_clusterInfo);
     Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
@@ -13864,14 +14835,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaFastForward_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            mediaInputClusterCommandInfo);
+    clusterMap.put("mediaInput", mediaInputClusterInfo);
+    Map<String, CommandInfo> mediaPlaybackClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> mediaPlaybackmediaFastForwardCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaFastForward_commandParameter =
+    CommandParameter mediaPlaybackmediaFastForwardCommandParameter =
         new CommandParameter(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaFastForward_CommandInfo =
+    CommandInfo mediaPlaybackmediaFastForwardCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13883,6 +14861,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                           callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaFastForward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
@@ -13894,13 +14873,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaNext_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaFastForwardResponseCallback(),
+            mediaPlaybackmediaFastForwardCommandParams);
+    mediaPlaybackClusterCommandInfo.put(
+        "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaNextCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaNext_commandParameter =
+    CommandParameter mediaPlaybackmediaNextCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaNext_CommandInfo =
+    CommandInfo mediaPlaybackmediaNextCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13911,6 +14898,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaNext_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
@@ -13921,13 +14909,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaPause_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaNextResponseCallback(),
+            mediaPlaybackmediaNextCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaPauseCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaPause_commandParameter =
+    CommandParameter mediaPlaybackmediaPauseCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaPause_CommandInfo =
+    CommandInfo mediaPlaybackmediaPauseCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13938,6 +14933,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPause_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
@@ -13948,13 +14944,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaPlay_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaPauseResponseCallback(),
+            mediaPlaybackmediaPauseCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaPlayCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaPlay_commandParameter =
+    CommandParameter mediaPlaybackmediaPlayCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaPlay_CommandInfo =
+    CommandInfo mediaPlaybackmediaPlayCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13965,6 +14968,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPlay_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
@@ -13975,13 +14979,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaPrevious_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaPlayResponseCallback(),
+            mediaPlaybackmediaPlayCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaPreviousCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaPrevious_commandParameter =
+    CommandParameter mediaPlaybackmediaPreviousCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaPrevious_CommandInfo =
+    CommandInfo mediaPlaybackmediaPreviousCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -13992,6 +15003,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaPrevious_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
@@ -14002,13 +15014,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaRewind_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaPreviousResponseCallback(),
+            mediaPlaybackmediaPreviousCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaRewindCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaRewind_commandParameter =
+    CommandParameter mediaPlaybackmediaRewindCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaRewind_CommandInfo =
+    CommandInfo mediaPlaybackmediaRewindCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14019,6 +15038,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaRewind_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
@@ -14032,18 +15052,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaSeek_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaRewindResponseCallback(),
+            mediaPlaybackmediaRewindCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaSeekCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaSeek_commandParameter =
+    CommandParameter mediaPlaybackmediaSeekCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
-    CommandParameter mediaPlayback_mediaSeek_position_commandParameter =
+    CommandParameter mediaPlaybackmediaSeekpositionCommandParameter =
         new CommandParameter("position", long.class);
+<<<<<<< HEAD
     mediaPlayback_mediaSeek_commandParams.put(
         "position", mediaPlayback_mediaSeek_position_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    mediaPlaybackmediaSeekCommandParams.put(
+        "position", mediaPlaybackmediaSeekpositionCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo mediaPlayback_mediaSeek_CommandInfo =
+    CommandInfo mediaPlaybackmediaSeekCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14055,6 +15087,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("position"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSeek_commandParams);
     mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
@@ -14069,20 +15102,31 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaSkipBackward_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaSeekResponseCallback(),
+            mediaPlaybackmediaSeekCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaSkipBackwardCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaSkipBackward_commandParameter =
+    CommandParameter mediaPlaybackmediaSkipBackwardCommandParameter =
         new CommandParameter(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
-    CommandParameter mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter =
+    CommandParameter mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameter =
         new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipBackward_commandParams.put(
+    mediaPlaybackmediaSkipBackwardCommandParams.put(
         "deltaPositionMilliseconds",
+<<<<<<< HEAD
         mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo mediaPlayback_mediaSkipBackward_CommandInfo =
+    CommandInfo mediaPlaybackmediaSkipBackwardCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14095,6 +15139,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("deltaPositionMilliseconds"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSkipBackward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
@@ -14110,20 +15155,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaSkipForward_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaSkipBackwardResponseCallback(),
+            mediaPlaybackmediaSkipBackwardCommandParams);
+    mediaPlaybackClusterCommandInfo.put(
+        "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaSkipForwardCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaSkipForward_commandParameter =
+    CommandParameter mediaPlaybackmediaSkipForwardCommandParameter =
         new CommandParameter(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
-    CommandParameter mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter =
+    CommandParameter mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameter =
         new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipForward_commandParams.put(
+    mediaPlaybackmediaSkipForwardCommandParams.put(
         "deltaPositionMilliseconds",
+<<<<<<< HEAD
         mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo mediaPlayback_mediaSkipForward_CommandInfo =
+    CommandInfo mediaPlaybackmediaSkipForwardCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14135,6 +15192,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("deltaPositionMilliseconds"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaSkipForward_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
@@ -14146,14 +15204,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaStartOver_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaSkipForwardResponseCallback(),
+            mediaPlaybackmediaSkipForwardCommandParams);
+    mediaPlaybackClusterCommandInfo.put(
+        "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaStartOverCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaStartOver_commandParameter =
+    CommandParameter mediaPlaybackmediaStartOverCommandParameter =
         new CommandParameter(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaStartOver_CommandInfo =
+    CommandInfo mediaPlaybackmediaStartOverCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14164,6 +15230,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             mediaPlayback_mediaStartOver_commandParams);
     mediaPlayback_ClusterCommandInfo.put(
@@ -14175,13 +15242,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> mediaPlayback_mediaStop_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedMediaStartOverResponseCallback(),
+            mediaPlaybackmediaStartOverCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
+    Map<String, CommandParameter> mediaPlaybackmediaStopCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter mediaPlayback_mediaStop_commandParameter =
+    CommandParameter mediaPlaybackmediaStopCommandParameter =
         new CommandParameter(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo mediaPlayback_mediaStop_CommandInfo =
+    CommandInfo mediaPlaybackmediaStopCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14192,13 +15266,14 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaStop_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaStop", mediaPlayback_mediaStop_CommandInfo);
+            () -> new DelegatedMediaStopResponseCallback(),
+            mediaPlaybackmediaStopCommandParams);
+    mediaPlaybackClusterCommandInfo.put("mediaStop", mediaPlaybackmediaStopCommandInfo);
     // Populate cluster
-    ClusterInfo mediaPlayback_clusterInfo =
+    ClusterInfo mediaPlaybackClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
+<<<<<<< HEAD
             mediaPlayback_ClusterCommandInfo);
     clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
     Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
@@ -14223,30 +15298,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_addThreadNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            mediaPlaybackClusterCommandInfo);
+    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
+    Map<String, CommandInfo> networkCommissioningClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> networkCommissioningaddThreadNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_addThreadNetwork_commandParameter =
+    CommandParameter networkCommissioningaddThreadNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_addThreadNetwork_operationalDataset_commandParameter =
+    CommandParameter networkCommissioningaddThreadNetworkoperationalDatasetCommandParameter =
         new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_addThreadNetwork_commandParams.put(
+    networkCommissioningaddThreadNetworkCommandParams.put(
         "operationalDataset",
-        networkCommissioning_addThreadNetwork_operationalDataset_commandParameter);
+        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameter);
 
-    CommandParameter networkCommissioning_addThreadNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningaddThreadNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addThreadNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_addThreadNetwork_breadcrumb_commandParameter);
+    networkCommissioningaddThreadNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningaddThreadNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_addThreadNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningaddThreadNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_addThreadNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_addThreadNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningaddThreadNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningaddThreadNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_addThreadNetwork_CommandInfo =
+    CommandInfo networkCommissioningaddThreadNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14261,6 +15348,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_addThreadNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14290,34 +15378,47 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_addWiFiNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedAddThreadNetworkResponseCallback(),
+            networkCommissioningaddThreadNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
+    Map<String, CommandParameter> networkCommissioningaddWiFiNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_addWiFiNetwork_commandParameter =
+    CommandParameter networkCommissioningaddWiFiNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_addWiFiNetwork_ssid_commandParameter =
+    CommandParameter networkCommissioningaddWiFiNetworkssidCommandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_addWiFiNetwork_commandParams.put(
-        "ssid", networkCommissioning_addWiFiNetwork_ssid_commandParameter);
+    networkCommissioningaddWiFiNetworkCommandParams.put(
+        "ssid", networkCommissioningaddWiFiNetworkssidCommandParameter);
 
-    CommandParameter networkCommissioning_addWiFiNetwork_credentials_commandParameter =
+    CommandParameter networkCommissioningaddWiFiNetworkcredentialsCommandParameter =
         new CommandParameter("credentials", byte[].class);
-    networkCommissioning_addWiFiNetwork_commandParams.put(
-        "credentials", networkCommissioning_addWiFiNetwork_credentials_commandParameter);
+    networkCommissioningaddWiFiNetworkCommandParams.put(
+        "credentials", networkCommissioningaddWiFiNetworkcredentialsCommandParameter);
 
-    CommandParameter networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningaddWiFiNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addWiFiNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter);
+    networkCommissioningaddWiFiNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningaddWiFiNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningaddWiFiNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_addWiFiNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningaddWiFiNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningaddWiFiNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_addWiFiNetwork_CommandInfo =
+    CommandInfo networkCommissioningaddWiFiNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14333,6 +15434,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_addWiFiNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14358,29 +15460,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_disableNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedAddWiFiNetworkResponseCallback(),
+            networkCommissioningaddWiFiNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
+    Map<String, CommandParameter> networkCommissioningdisableNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_disableNetwork_commandParameter =
+    CommandParameter networkCommissioningdisableNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_disableNetwork_networkID_commandParameter =
+    CommandParameter networkCommissioningdisableNetworknetworkIDCommandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_disableNetwork_commandParams.put(
-        "networkID", networkCommissioning_disableNetwork_networkID_commandParameter);
+    networkCommissioningdisableNetworkCommandParams.put(
+        "networkID", networkCommissioningdisableNetworknetworkIDCommandParameter);
 
-    CommandParameter networkCommissioning_disableNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningdisableNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_disableNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_disableNetwork_breadcrumb_commandParameter);
+    networkCommissioningdisableNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningdisableNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_disableNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningdisableNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_disableNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_disableNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningdisableNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningdisableNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_disableNetwork_CommandInfo =
+    CommandInfo networkCommissioningdisableNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14395,6 +15510,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_disableNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14417,29 +15533,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_enableNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedDisableNetworkResponseCallback(),
+            networkCommissioningdisableNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
+    Map<String, CommandParameter> networkCommissioningenableNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_enableNetwork_commandParameter =
+    CommandParameter networkCommissioningenableNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_enableNetwork_networkID_commandParameter =
+    CommandParameter networkCommissioningenableNetworknetworkIDCommandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_enableNetwork_commandParams.put(
-        "networkID", networkCommissioning_enableNetwork_networkID_commandParameter);
+    networkCommissioningenableNetworkCommandParams.put(
+        "networkID", networkCommissioningenableNetworknetworkIDCommandParameter);
 
-    CommandParameter networkCommissioning_enableNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningenableNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_enableNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_enableNetwork_breadcrumb_commandParameter);
+    networkCommissioningenableNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningenableNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_enableNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningenableNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_enableNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_enableNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningenableNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningenableNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_enableNetwork_CommandInfo =
+    CommandInfo networkCommissioningenableNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14454,6 +15583,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_enableNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14468,22 +15598,32 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioning_getLastNetworkCommissioningResult_commandParams.add(
         getLastNetworkCommissioningResult_timeoutMs_commandParameter);
 =======
+=======
+            () -> new DelegatedEnableNetworkResponseCallback(),
+            networkCommissioningenableNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "enableNetwork", networkCommissioningenableNetworkCommandInfo);
+>>>>>>> 41b0956c1 (on/off commands working)
     Map<String, CommandParameter>
-        networkCommissioning_getLastNetworkCommissioningResult_commandParams =
-            new HashMap<String, CommandParameter>();
+        networkCommissioninggetLastNetworkCommissioningResultCommandParams =
+            new LinkedHashMap<String, CommandParameter>();
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_getLastNetworkCommissioningResult_commandParameter =
+    CommandParameter networkCommissioninggetLastNetworkCommissioningResultCommandParameter =
         new CommandParameter("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameter
-        networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter =
+        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameter =
             new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_getLastNetworkCommissioningResult_commandParams.put(
+    networkCommissioninggetLastNetworkCommissioningResultCommandParams.put(
         "timeoutMs",
+<<<<<<< HEAD
         networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_getLastNetworkCommissioningResult_CommandInfo =
+    CommandInfo networkCommissioninggetLastNetworkCommissioningResultCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14495,9 +15635,10 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_getLastNetworkCommissioningResult_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
+            networkCommissioninggetLastNetworkCommissioningResultCommandParams);
+    networkCommissioningClusterCommandInfo.put(
         "getLastNetworkCommissioningResult",
+<<<<<<< HEAD
         networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
 <<<<<<< HEAD
     List<CommandParameter> networkCommissioning_removeNetwork_commandParams = new ArrayList<>();
@@ -14517,29 +15658,39 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_removeNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+        networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
+    Map<String, CommandParameter> networkCommissioningremoveNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_removeNetwork_commandParameter =
+    CommandParameter networkCommissioningremoveNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_removeNetwork_networkID_commandParameter =
+    CommandParameter networkCommissioningremoveNetworknetworkIDCommandParameter =
         new CommandParameter("networkID", byte[].class);
-    networkCommissioning_removeNetwork_commandParams.put(
-        "networkID", networkCommissioning_removeNetwork_networkID_commandParameter);
+    networkCommissioningremoveNetworkCommandParams.put(
+        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameter);
 
-    CommandParameter networkCommissioning_removeNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningremoveNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_removeNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_removeNetwork_breadcrumb_commandParameter);
+    networkCommissioningremoveNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_removeNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningremoveNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_removeNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_removeNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningremoveNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningremoveNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_removeNetwork_CommandInfo =
+    CommandInfo networkCommissioningremoveNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14554,6 +15705,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_removeNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14576,29 +15728,42 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_scanNetworks_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedRemoveNetworkResponseCallback(),
+            networkCommissioningremoveNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
+    Map<String, CommandParameter> networkCommissioningscanNetworksCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_scanNetworks_commandParameter =
+    CommandParameter networkCommissioningscanNetworksCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
-    CommandParameter networkCommissioning_scanNetworks_ssid_commandParameter =
+    CommandParameter networkCommissioningscanNetworksssidCommandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_scanNetworks_commandParams.put(
-        "ssid", networkCommissioning_scanNetworks_ssid_commandParameter);
+    networkCommissioningscanNetworksCommandParams.put(
+        "ssid", networkCommissioningscanNetworksssidCommandParameter);
 
-    CommandParameter networkCommissioning_scanNetworks_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningscanNetworksbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_scanNetworks_commandParams.put(
-        "breadcrumb", networkCommissioning_scanNetworks_breadcrumb_commandParameter);
+    networkCommissioningscanNetworksCommandParams.put(
+        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_scanNetworks_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningscanNetworkstimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_scanNetworks_commandParams.put(
         "timeoutMs", networkCommissioning_scanNetworks_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningscanNetworksCommandParams.put(
+        "timeoutMs", networkCommissioningscanNetworkstimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_scanNetworks_CommandInfo =
+    CommandInfo networkCommissioningscanNetworksCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14613,6 +15778,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_scanNetworks_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14639,30 +15805,43 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedScanNetworksResponseCallback(),
+            networkCommissioningscanNetworksCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "scanNetworks", networkCommissioningscanNetworksCommandInfo);
+    Map<String, CommandParameter> networkCommissioningupdateThreadNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_updateThreadNetwork_commandParameter =
+    CommandParameter networkCommissioningupdateThreadNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter =
+    CommandParameter networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameter =
         new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_updateThreadNetwork_commandParams.put(
+    networkCommissioningupdateThreadNetworkCommandParams.put(
         "operationalDataset",
-        networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter);
+        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameter);
 
-    CommandParameter networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningupdateThreadNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateThreadNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter);
+    networkCommissioningupdateThreadNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningupdateThreadNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningupdateThreadNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_updateThreadNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningupdateThreadNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningupdateThreadNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_updateThreadNetwork_CommandInfo =
+    CommandInfo networkCommissioningupdateThreadNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14677,6 +15856,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioning_updateThreadNetwork_commandParams);
     networkCommissioning_ClusterCommandInfo.put(
@@ -14707,34 +15887,47 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedUpdateThreadNetworkResponseCallback(),
+            networkCommissioningupdateThreadNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
+    Map<String, CommandParameter> networkCommissioningupdateWiFiNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioning_updateWiFiNetwork_commandParameter =
+    CommandParameter networkCommissioningupdateWiFiNetworkCommandParameter =
         new CommandParameter(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
-    CommandParameter networkCommissioning_updateWiFiNetwork_ssid_commandParameter =
+    CommandParameter networkCommissioningupdateWiFiNetworkssidCommandParameter =
         new CommandParameter("ssid", byte[].class);
-    networkCommissioning_updateWiFiNetwork_commandParams.put(
-        "ssid", networkCommissioning_updateWiFiNetwork_ssid_commandParameter);
+    networkCommissioningupdateWiFiNetworkCommandParams.put(
+        "ssid", networkCommissioningupdateWiFiNetworkssidCommandParameter);
 
-    CommandParameter networkCommissioning_updateWiFiNetwork_credentials_commandParameter =
+    CommandParameter networkCommissioningupdateWiFiNetworkcredentialsCommandParameter =
         new CommandParameter("credentials", byte[].class);
-    networkCommissioning_updateWiFiNetwork_commandParams.put(
-        "credentials", networkCommissioning_updateWiFiNetwork_credentials_commandParameter);
+    networkCommissioningupdateWiFiNetworkCommandParams.put(
+        "credentials", networkCommissioningupdateWiFiNetworkcredentialsCommandParameter);
 
-    CommandParameter networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter =
+    CommandParameter networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameter =
         new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateWiFiNetwork_commandParams.put(
-        "breadcrumb", networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter);
+    networkCommissioningupdateWiFiNetworkCommandParams.put(
+        "breadcrumb", networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameter);
 
-    CommandParameter networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter =
+    CommandParameter networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
+<<<<<<< HEAD
     networkCommissioning_updateWiFiNetwork_commandParams.put(
         "timeoutMs", networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    networkCommissioningupdateWiFiNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo networkCommissioning_updateWiFiNetwork_CommandInfo =
+    CommandInfo networkCommissioningupdateWiFiNetworkCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14750,14 +15943,15 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("timeoutMs"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_updateWiFiNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "updateWiFiNetwork", networkCommissioning_updateWiFiNetwork_CommandInfo);
+            () -> new DelegatedUpdateWiFiNetworkResponseCallback(),
+            networkCommissioningupdateWiFiNetworkCommandParams);
+    networkCommissioningClusterCommandInfo.put(
+        "updateWiFiNetwork", networkCommissioningupdateWiFiNetworkCommandInfo);
     // Populate cluster
-    ClusterInfo networkCommissioning_clusterInfo =
+    ClusterInfo networkCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
+<<<<<<< HEAD
             networkCommissioning_ClusterCommandInfo);
     clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
     Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
@@ -14778,24 +15972,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            networkCommissioningClusterCommandInfo);
+    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestCommandParameter =
         new CommandParameter(
             "OtaSoftwareUpdateProvider",
             ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
-    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameter =
         new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put(
-        "updateToken", otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
+        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter =
         new CommandParameter("newVersion", long.class);
+<<<<<<< HEAD
     otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put(
         "newVersion", otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
+        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo =
+    CommandInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14810,6 +16016,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Long) commandArguments.get("newVersion"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateProvider_applyUpdateRequest_commandParams);
     otaSoftwareUpdateProvider_ClusterCommandInfo.put(
@@ -14831,25 +16038,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedApplyUpdateRequestResponseCallback(),
+            otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
+    otaSoftwareUpdateProviderClusterCommandInfo.put(
+        "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
+    Map<String, CommandParameter> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_commandParameter =
+    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameter =
         new CommandParameter(
             "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter =
+    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameter =
         new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put(
-        "updateToken", otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
+        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameter);
 
-    CommandParameter
-        otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter =
-            new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put(
+    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameter =
+        new CommandParameter("softwareVersion", long.class);
+    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "softwareVersion",
+<<<<<<< HEAD
         otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo =
+    CommandInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14863,6 +16081,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams);
     otaSoftwareUpdateProvider_ClusterCommandInfo.put(
         "notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
@@ -14909,57 +16128,68 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams);
+    otaSoftwareUpdateProviderClusterCommandInfo.put(
+        "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
+    Map<String, CommandParameter> otaSoftwareUpdateProviderqueryImageCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProvider_queryImage_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImageCommandParameter =
         new CommandParameter(
             "OtaSoftwareUpdateProvider",
             ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
-    CommandParameter otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagevendorIdCommandParameter =
         new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
-        "vendorId", otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_productId_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImageproductIdCommandParameter =
         new CommandParameter("productId", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
-        "productId", otaSoftwareUpdateProvider_queryImage_productId_commandParameter);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameter =
         new CommandParameter("hardwareVersion", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
-        "hardwareVersion", otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameter =
         new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
-        "softwareVersion", otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameter =
         new CommandParameter("protocolsSupported", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "protocolsSupported",
-        otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter);
+        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_location_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagelocationCommandParameter =
         new CommandParameter("location", String.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
-        "location", otaSoftwareUpdateProvider_queryImage_location_commandParameter);
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
+        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameter =
         new CommandParameter("requestorCanConsent", boolean.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "requestorCanConsent",
-        otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter);
+        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameter);
 
-    CommandParameter otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter =
+    CommandParameter otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameter =
         new CommandParameter("metadataForProvider", byte[].class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.put(
+    otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "metadataForProvider",
+<<<<<<< HEAD
         otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo otaSoftwareUpdateProvider_queryImage_CommandInfo =
+    CommandInfo otaSoftwareUpdateProviderqueryImageCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -14979,14 +16209,15 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("metadataForProvider"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateProvider_queryImage_commandParams);
-    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
-        "queryImage", otaSoftwareUpdateProvider_queryImage_CommandInfo);
+            () -> new DelegatedQueryImageResponseCallback(),
+            otaSoftwareUpdateProviderqueryImageCommandParams);
+    otaSoftwareUpdateProviderClusterCommandInfo.put(
+        "queryImage", otaSoftwareUpdateProviderqueryImageCommandInfo);
     // Populate cluster
-    ClusterInfo otaSoftwareUpdateProvider_clusterInfo =
+    ClusterInfo otaSoftwareUpdateProviderClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
+<<<<<<< HEAD
             otaSoftwareUpdateProvider_ClusterCommandInfo);
     clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
     Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
@@ -15017,39 +16248,48 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            otaSoftwareUpdateProviderClusterCommandInfo);
+    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateRequestorClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_commandParameter =
+    CommandParameter otaSoftwareUpdateRequestorannounceOtaProviderCommandParameter =
         new CommandParameter(
             "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter =
-            new CommandParameter("providerLocation", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+    CommandParameter otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameter =
+        new CommandParameter("providerLocation", byte[].class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "providerLocation",
-        otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter);
+        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameter);
 
-    CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter =
+    CommandParameter otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameter =
         new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
-        "vendorId", otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
+        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameter);
 
     CommandParameter
-        otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter =
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameter =
             new CommandParameter("announcementReason", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "announcementReason",
-        otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter);
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameter);
 
-    CommandParameter
-        otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter =
-            new CommandParameter("metadataForNode", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put(
+    CommandParameter otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameter =
+        new CommandParameter("metadataForNode", byte[].class);
+    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "metadataForNode",
+<<<<<<< HEAD
         otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo =
+    CommandInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15065,21 +16305,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateRequestor_announceOtaProvider_commandParams);
-    otaSoftwareUpdateRequestor_ClusterCommandInfo.put(
-        "announceOtaProvider", otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo);
+            otaSoftwareUpdateRequestorannounceOtaProviderCommandParams);
+    otaSoftwareUpdateRequestorClusterCommandInfo.put(
+        "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo);
     // Populate cluster
-    ClusterInfo otaSoftwareUpdateRequestor_clusterInfo =
+    ClusterInfo otaSoftwareUpdateRequestorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
-            otaSoftwareUpdateRequestor_ClusterCommandInfo);
-    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
-    Map<String, CommandInfo> occupancySensing_ClusterCommandInfo = new HashMap<>();
+            otaSoftwareUpdateRequestorClusterCommandInfo);
+    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
+    Map<String, CommandInfo> occupancySensingClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo occupancySensing_clusterInfo =
+    ClusterInfo occupancySensingClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
+<<<<<<< HEAD
             occupancySensing_ClusterCommandInfo);
     clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
     Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
@@ -15089,12 +16330,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 
 =======
     Map<String, CommandParameter> onOff_off_commandParams = new HashMap<String, CommandParameter>();
+=======
+            occupancySensingClusterCommandInfo);
+    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
+    Map<String, CommandInfo> onOffClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> onOffoffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_off_commandParameter =
+    CommandParameter onOffoffCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo onOff_off_CommandInfo =
+    CommandInfo onOffoffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15104,6 +16352,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             onOff_off_commandParams);
     onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
 <<<<<<< HEAD
@@ -15120,22 +16369,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> onOff_offWithEffect_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            onOffoffCommandParams);
+    onOffClusterCommandInfo.put("off", onOffoffCommandInfo);
+    Map<String, CommandParameter> onOffoffWithEffectCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_offWithEffect_commandParameter =
+    CommandParameter onOffoffWithEffectCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter onOff_offWithEffect_effectId_commandParameter =
+    CommandParameter onOffoffWithEffecteffectIdCommandParameter =
         new CommandParameter("effectId", int.class);
-    onOff_offWithEffect_commandParams.put(
-        "effectId", onOff_offWithEffect_effectId_commandParameter);
+    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameter);
 
-    CommandParameter onOff_offWithEffect_effectVariant_commandParameter =
+    CommandParameter onOffoffWithEffecteffectVariantCommandParameter =
         new CommandParameter("effectVariant", int.class);
+<<<<<<< HEAD
     onOff_offWithEffect_commandParams.put(
         "effectVariant", onOff_offWithEffect_effectVariant_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    onOffoffWithEffectCommandParams.put(
+        "effectVariant", onOffoffWithEffecteffectVariantCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo onOff_offWithEffect_CommandInfo =
+    CommandInfo onOffoffWithEffectCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15149,6 +16408,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             onOff_offWithEffect_commandParams);
     onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
 <<<<<<< HEAD
@@ -15157,12 +16417,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 
 =======
     Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
+=======
+            onOffoffWithEffectCommandParams);
+    onOffClusterCommandInfo.put("offWithEffect", onOffoffWithEffectCommandInfo);
+    Map<String, CommandParameter> onOffonCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_on_commandParameter =
+    CommandParameter onOffonCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo onOff_on_CommandInfo =
+    CommandInfo onOffonCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15172,6 +16438,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             onOff_on_commandParams);
     onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
 <<<<<<< HEAD
@@ -15181,12 +16448,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> onOff_onWithRecallGlobalScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            onOffonCommandParams);
+    onOffClusterCommandInfo.put("on", onOffonCommandInfo);
+    Map<String, CommandParameter> onOffonWithRecallGlobalSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_onWithRecallGlobalScene_commandParameter =
+    CommandParameter onOffonWithRecallGlobalSceneCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo onOff_onWithRecallGlobalScene_CommandInfo =
+    CommandInfo onOffonWithRecallGlobalSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15197,6 +16470,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             onOff_onWithRecallGlobalScene_commandParams);
     onOff_ClusterCommandInfo.put(
         "onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
@@ -15218,26 +16492,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> onOff_onWithTimedOff_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            onOffonWithRecallGlobalSceneCommandParams);
+    onOffClusterCommandInfo.put("onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
+    Map<String, CommandParameter> onOffonWithTimedOffCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_onWithTimedOff_commandParameter =
+    CommandParameter onOffonWithTimedOffCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter onOff_onWithTimedOff_onOffControl_commandParameter =
+    CommandParameter onOffonWithTimedOffonOffControlCommandParameter =
         new CommandParameter("onOffControl", int.class);
-    onOff_onWithTimedOff_commandParams.put(
-        "onOffControl", onOff_onWithTimedOff_onOffControl_commandParameter);
+    onOffonWithTimedOffCommandParams.put(
+        "onOffControl", onOffonWithTimedOffonOffControlCommandParameter);
 
-    CommandParameter onOff_onWithTimedOff_onTime_commandParameter =
+    CommandParameter onOffonWithTimedOffonTimeCommandParameter =
         new CommandParameter("onTime", int.class);
-    onOff_onWithTimedOff_commandParams.put("onTime", onOff_onWithTimedOff_onTime_commandParameter);
+    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameter);
 
-    CommandParameter onOff_onWithTimedOff_offWaitTime_commandParameter =
+    CommandParameter onOffonWithTimedOffoffWaitTimeCommandParameter =
         new CommandParameter("offWaitTime", int.class);
+<<<<<<< HEAD
     onOff_onWithTimedOff_commandParams.put(
         "offWaitTime", onOff_onWithTimedOff_offWaitTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    onOffonWithTimedOffCommandParams.put(
+        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo onOff_onWithTimedOff_CommandInfo =
+    CommandInfo onOffonWithTimedOffCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15252,6 +16537,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             onOff_onWithTimedOff_commandParams);
     onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
 <<<<<<< HEAD
@@ -15261,12 +16547,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> onOff_toggle_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            onOffonWithTimedOffCommandParams);
+    onOffClusterCommandInfo.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
+    Map<String, CommandParameter> onOfftoggleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter onOff_toggle_commandParameter =
+    CommandParameter onOfftoggleCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo onOff_toggle_CommandInfo =
+    CommandInfo onOfftoggleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15276,19 +16568,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            onOff_toggle_commandParams);
-    onOff_ClusterCommandInfo.put("toggle", onOff_toggle_CommandInfo);
+            onOfftoggleCommandParams);
+    onOffClusterCommandInfo.put("toggle", onOfftoggleCommandInfo);
     // Populate cluster
-    ClusterInfo onOff_clusterInfo =
+    ClusterInfo onOffClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId),
-            onOff_ClusterCommandInfo);
-    clusterMap.put("onOff", onOff_clusterInfo);
-    Map<String, CommandInfo> onOffSwitchConfiguration_ClusterCommandInfo = new HashMap<>();
+            onOffClusterCommandInfo);
+    clusterMap.put("onOff", onOffClusterInfo);
+    Map<String, CommandInfo> onOffSwitchConfigurationClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo onOffSwitchConfiguration_clusterInfo =
+    ClusterInfo onOffSwitchConfigurationClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
+<<<<<<< HEAD
             onOffSwitchConfiguration_ClusterCommandInfo);
     clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
     Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
@@ -15318,39 +16611,51 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_addNOC_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            onOffSwitchConfigurationClusterCommandInfo);
+    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
+    Map<String, CommandInfo> operationalCredentialsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> operationalCredentialsaddNOCCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_addNOC_commandParameter =
+    CommandParameter operationalCredentialsaddNOCCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentials_addNOC_NOCValue_commandParameter =
+    CommandParameter operationalCredentialsaddNOCNOCValueCommandParameter =
         new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.put(
-        "NOCValue", operationalCredentials_addNOC_NOCValue_commandParameter);
+    operationalCredentialsaddNOCCommandParams.put(
+        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameter);
 
-    CommandParameter operationalCredentials_addNOC_ICACValue_commandParameter =
+    CommandParameter operationalCredentialsaddNOCICACValueCommandParameter =
         new CommandParameter("ICACValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.put(
-        "ICACValue", operationalCredentials_addNOC_ICACValue_commandParameter);
+    operationalCredentialsaddNOCCommandParams.put(
+        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameter);
 
-    CommandParameter operationalCredentials_addNOC_IPKValue_commandParameter =
+    CommandParameter operationalCredentialsaddNOCIPKValueCommandParameter =
         new CommandParameter("IPKValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.put(
-        "IPKValue", operationalCredentials_addNOC_IPKValue_commandParameter);
+    operationalCredentialsaddNOCCommandParams.put(
+        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameter);
 
-    CommandParameter operationalCredentials_addNOC_caseAdminNode_commandParameter =
+    CommandParameter operationalCredentialsaddNOCcaseAdminNodeCommandParameter =
         new CommandParameter("caseAdminNode", long.class);
-    operationalCredentials_addNOC_commandParams.put(
-        "caseAdminNode", operationalCredentials_addNOC_caseAdminNode_commandParameter);
+    operationalCredentialsaddNOCCommandParams.put(
+        "caseAdminNode", operationalCredentialsaddNOCcaseAdminNodeCommandParameter);
 
-    CommandParameter operationalCredentials_addNOC_adminVendorId_commandParameter =
+    CommandParameter operationalCredentialsaddNOCadminVendorIdCommandParameter =
         new CommandParameter("adminVendorId", int.class);
+<<<<<<< HEAD
     operationalCredentials_addNOC_commandParams.put(
         "adminVendorId", operationalCredentials_addNOC_adminVendorId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    operationalCredentialsaddNOCCommandParams.put(
+        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_addNOC_CommandInfo =
+    CommandInfo operationalCredentialsaddNOCCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15366,6 +16671,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("adminVendorId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_addNOC_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15382,19 +16688,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsaddNOCCommandParams);
+    operationalCredentialsClusterCommandInfo.put("addNOC", operationalCredentialsaddNOCCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsaddTrustedRootCertificateCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_addTrustedRootCertificate_commandParameter =
+    CommandParameter operationalCredentialsaddTrustedRootCertificateCommandParameter =
         new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
     CommandParameter
-        operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter =
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameter =
             new CommandParameter("rootCertificate", byte[].class);
-    operationalCredentials_addTrustedRootCertificate_commandParams.put(
+    operationalCredentialsaddTrustedRootCertificateCommandParams.put(
         "rootCertificate",
+<<<<<<< HEAD
         operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_addTrustedRootCertificate_CommandInfo =
+    CommandInfo operationalCredentialsaddTrustedRootCertificateCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15407,6 +16724,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             operationalCredentials_addTrustedRootCertificate_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
         "addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
@@ -15422,20 +16740,31 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_attestationRequest_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            operationalCredentialsaddTrustedRootCertificateCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsattestationRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_attestationRequest_commandParameter =
+    CommandParameter operationalCredentialsattestationRequestCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
-    CommandParameter operationalCredentials_attestationRequest_attestationNonce_commandParameter =
+    CommandParameter operationalCredentialsattestationRequestattestationNonceCommandParameter =
         new CommandParameter("attestationNonce", byte[].class);
-    operationalCredentials_attestationRequest_commandParams.put(
+    operationalCredentialsattestationRequestCommandParams.put(
         "attestationNonce",
+<<<<<<< HEAD
         operationalCredentials_attestationRequest_attestationNonce_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        operationalCredentialsattestationRequestattestationNonceCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_attestationRequest_CommandInfo =
+    CommandInfo operationalCredentialsattestationRequestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15448,6 +16777,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("attestationNonce"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_attestationRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15464,21 +16794,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedAttestationResponseCallback(),
+            operationalCredentialsattestationRequestCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
+    Map<String, CommandParameter> operationalCredentialscertificateChainRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_certificateChainRequest_commandParameter =
+    CommandParameter operationalCredentialscertificateChainRequestCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
-    CommandParameter
-        operationalCredentials_certificateChainRequest_certificateType_commandParameter =
-            new CommandParameter("certificateType", int.class);
-    operationalCredentials_certificateChainRequest_commandParams.put(
+    CommandParameter operationalCredentialscertificateChainRequestcertificateTypeCommandParameter =
+        new CommandParameter("certificateType", int.class);
+    operationalCredentialscertificateChainRequestCommandParams.put(
         "certificateType",
+<<<<<<< HEAD
         operationalCredentials_certificateChainRequest_certificateType_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        operationalCredentialscertificateChainRequestcertificateTypeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_certificateChainRequest_CommandInfo =
+    CommandInfo operationalCredentialscertificateChainRequestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15491,6 +16832,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("certificateType"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_certificateChainRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15505,19 +16847,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_opCSRRequest_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedCertificateChainResponseCallback(),
+            operationalCredentialscertificateChainRequestCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsopCSRRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_opCSRRequest_commandParameter =
+    CommandParameter operationalCredentialsopCSRRequestCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
-    CommandParameter operationalCredentials_opCSRRequest_CSRNonce_commandParameter =
+    CommandParameter operationalCredentialsopCSRRequestCSRNonceCommandParameter =
         new CommandParameter("CSRNonce", byte[].class);
+<<<<<<< HEAD
     operationalCredentials_opCSRRequest_commandParams.put(
         "CSRNonce", operationalCredentials_opCSRRequest_CSRNonce_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    operationalCredentialsopCSRRequestCommandParams.put(
+        "CSRNonce", operationalCredentialsopCSRRequestCSRNonceCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_opCSRRequest_CommandInfo =
+    CommandInfo operationalCredentialsopCSRRequestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15529,6 +16884,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("CSRNonce"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_opCSRRequest_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15544,19 +16900,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_removeFabric_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedOpCSRResponseCallback(),
+            operationalCredentialsopCSRRequestCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsremoveFabricCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_removeFabric_commandParameter =
+    CommandParameter operationalCredentialsremoveFabricCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentials_removeFabric_fabricIndex_commandParameter =
+    CommandParameter operationalCredentialsremoveFabricfabricIndexCommandParameter =
         new CommandParameter("fabricIndex", int.class);
+<<<<<<< HEAD
     operationalCredentials_removeFabric_commandParams.put(
         "fabricIndex", operationalCredentials_removeFabric_fabricIndex_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    operationalCredentialsremoveFabricCommandParams.put(
+        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_removeFabric_CommandInfo =
+    CommandInfo operationalCredentialsremoveFabricCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15568,6 +16937,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("fabricIndex"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_removeFabric_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15585,19 +16955,31 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter>
         operationalCredentials_removeTrustedRootCertificate_commandParams =
             new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsremoveFabricCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "removeFabric", operationalCredentialsremoveFabricCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsremoveTrustedRootCertificateCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_removeTrustedRootCertificate_commandParameter =
+    CommandParameter operationalCredentialsremoveTrustedRootCertificateCommandParameter =
         new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
     CommandParameter
-        operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter =
+        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameter =
             new CommandParameter("trustedRootIdentifier", byte[].class);
-    operationalCredentials_removeTrustedRootCertificate_commandParams.put(
+    operationalCredentialsremoveTrustedRootCertificateCommandParams.put(
         "trustedRootIdentifier",
+<<<<<<< HEAD
         operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_removeTrustedRootCertificate_CommandInfo =
+    CommandInfo operationalCredentialsremoveTrustedRootCertificateCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15610,9 +16992,10 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_removeTrustedRootCertificate_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
+            operationalCredentialsremoveTrustedRootCertificateCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
         "removeTrustedRootCertificate",
+<<<<<<< HEAD
         operationalCredentials_removeTrustedRootCertificate_CommandInfo);
 <<<<<<< HEAD
     List<CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
@@ -15626,19 +17009,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+        operationalCredentialsremoveTrustedRootCertificateCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsupdateFabricLabelCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_updateFabricLabel_commandParameter =
+    CommandParameter operationalCredentialsupdateFabricLabelCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentials_updateFabricLabel_label_commandParameter =
+    CommandParameter operationalCredentialsupdateFabricLabellabelCommandParameter =
         new CommandParameter("label", String.class);
+<<<<<<< HEAD
     operationalCredentials_updateFabricLabel_commandParams.put(
         "label", operationalCredentials_updateFabricLabel_label_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    operationalCredentialsupdateFabricLabelCommandParams.put(
+        "label", operationalCredentialsupdateFabricLabellabelCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_updateFabricLabel_CommandInfo =
+    CommandInfo operationalCredentialsupdateFabricLabelCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15650,6 +17043,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("label"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentials_updateFabricLabel_commandParams);
     operationalCredentials_ClusterCommandInfo.put(
@@ -15668,24 +17062,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> operationalCredentials_updateNOC_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsupdateFabricLabelCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
+    Map<String, CommandParameter> operationalCredentialsupdateNOCCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentials_updateNOC_commandParameter =
+    CommandParameter operationalCredentialsupdateNOCCommandParameter =
         new CommandParameter(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentials_updateNOC_NOCValue_commandParameter =
+    CommandParameter operationalCredentialsupdateNOCNOCValueCommandParameter =
         new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_updateNOC_commandParams.put(
-        "NOCValue", operationalCredentials_updateNOC_NOCValue_commandParameter);
+    operationalCredentialsupdateNOCCommandParams.put(
+        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameter);
 
-    CommandParameter operationalCredentials_updateNOC_ICACValue_commandParameter =
+    CommandParameter operationalCredentialsupdateNOCICACValueCommandParameter =
         new CommandParameter("ICACValue", byte[].class);
+<<<<<<< HEAD
     operationalCredentials_updateNOC_commandParams.put(
         "ICACValue", operationalCredentials_updateNOC_ICACValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    operationalCredentialsupdateNOCCommandParams.put(
+        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo operationalCredentials_updateNOC_CommandInfo =
+    CommandInfo operationalCredentialsupdateNOCCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15697,45 +17104,46 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (byte[]) commandArguments.get("NOCValue"),
                       (byte[]) commandArguments.get("ICACValue"));
 >>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_updateNOC_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "updateNOC", operationalCredentials_updateNOC_CommandInfo);
+            },
+            () -> new DelegatedNOCResponseCallback(),
+            operationalCredentialsupdateNOCCommandParams);
+    operationalCredentialsClusterCommandInfo.put(
+        "updateNOC", operationalCredentialsupdateNOCCommandInfo);
     // Populate cluster
-    ClusterInfo operationalCredentials_clusterInfo =
+    ClusterInfo operationalCredentialsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
-            operationalCredentials_ClusterCommandInfo);
-    clusterMap.put("operationalCredentials", operationalCredentials_clusterInfo);
-    Map<String, CommandInfo> powerSource_ClusterCommandInfo = new HashMap<>();
+            operationalCredentialsClusterCommandInfo);
+    clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
+    Map<String, CommandInfo> powerSourceClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo powerSource_clusterInfo =
+    ClusterInfo powerSourceClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
-            powerSource_ClusterCommandInfo);
-    clusterMap.put("powerSource", powerSource_clusterInfo);
-    Map<String, CommandInfo> pressureMeasurement_ClusterCommandInfo = new HashMap<>();
+            powerSourceClusterCommandInfo);
+    clusterMap.put("powerSource", powerSourceClusterInfo);
+    Map<String, CommandInfo> pressureMeasurementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo pressureMeasurement_clusterInfo =
+    ClusterInfo pressureMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId),
-            pressureMeasurement_ClusterCommandInfo);
-    clusterMap.put("pressureMeasurement", pressureMeasurement_clusterInfo);
-    Map<String, CommandInfo> pumpConfigurationAndControl_ClusterCommandInfo = new HashMap<>();
+            pressureMeasurementClusterCommandInfo);
+    clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
+    Map<String, CommandInfo> pumpConfigurationAndControlClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo pumpConfigurationAndControl_clusterInfo =
+    ClusterInfo pumpConfigurationAndControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
-            pumpConfigurationAndControl_ClusterCommandInfo);
-    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
-    Map<String, CommandInfo> relativeHumidityMeasurement_ClusterCommandInfo = new HashMap<>();
+            pumpConfigurationAndControlClusterCommandInfo);
+    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
+    Map<String, CommandInfo> relativeHumidityMeasurementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo relativeHumidityMeasurement_clusterInfo =
+    ClusterInfo relativeHumidityMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
             relativeHumidityMeasurement_ClusterCommandInfo);
     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
     Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
@@ -15769,41 +17177,52 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_addScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            relativeHumidityMeasurementClusterCommandInfo);
+    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
+    Map<String, CommandInfo> scenesClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> scenesaddSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_addScene_commandParameter =
+    CommandParameter scenesaddSceneCommandParameter =
         new CommandParameter("Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
-    CommandParameter scenes_addScene_groupId_commandParameter =
+    CommandParameter scenesaddScenegroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_addScene_commandParams.put("groupId", scenes_addScene_groupId_commandParameter);
+    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameter);
 
-    CommandParameter scenes_addScene_sceneId_commandParameter =
+    CommandParameter scenesaddScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_addScene_commandParams.put("sceneId", scenes_addScene_sceneId_commandParameter);
+    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameter);
 
-    CommandParameter scenes_addScene_transitionTime_commandParameter =
+    CommandParameter scenesaddScenetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
-    scenes_addScene_commandParams.put(
-        "transitionTime", scenes_addScene_transitionTime_commandParameter);
+    scenesaddSceneCommandParams.put("transitionTime", scenesaddScenetransitionTimeCommandParameter);
 
-    CommandParameter scenes_addScene_sceneName_commandParameter =
+    CommandParameter scenesaddScenesceneNameCommandParameter =
         new CommandParameter("sceneName", String.class);
-    scenes_addScene_commandParams.put("sceneName", scenes_addScene_sceneName_commandParameter);
+    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameter);
 
-    CommandParameter scenes_addScene_clusterId_commandParameter =
+    CommandParameter scenesaddSceneclusterIdCommandParameter =
         new CommandParameter("clusterId", long.class);
-    scenes_addScene_commandParams.put("clusterId", scenes_addScene_clusterId_commandParameter);
+    scenesaddSceneCommandParams.put("clusterId", scenesaddSceneclusterIdCommandParameter);
 
-    CommandParameter scenes_addScene_length_commandParameter =
+    CommandParameter scenesaddScenelengthCommandParameter =
         new CommandParameter("length", int.class);
-    scenes_addScene_commandParams.put("length", scenes_addScene_length_commandParameter);
+    scenesaddSceneCommandParams.put("length", scenesaddScenelengthCommandParameter);
 
+<<<<<<< HEAD
     CommandParameter scenes_addScene_value_commandParameter =
         new CommandParameter("value", int.class);
     scenes_addScene_commandParams.put("value", scenes_addScene_value_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    CommandParameter scenesaddScenevalueCommandParameter = new CommandParameter("value", int.class);
+    scenesaddSceneCommandParams.put("value", scenesaddScenevalueCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_addScene_CommandInfo =
+    CommandInfo scenesaddSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15821,6 +17240,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("value"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             scenes_addScene_commandParams);
     scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
@@ -15834,18 +17254,30 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_getSceneMembership_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedAddSceneResponseCallback(),
+            scenesaddSceneCommandParams);
+    scenesClusterCommandInfo.put("addScene", scenesaddSceneCommandInfo);
+    Map<String, CommandParameter> scenesgetSceneMembershipCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_getSceneMembership_commandParameter =
+    CommandParameter scenesgetSceneMembershipCommandParameter =
         new CommandParameter(
             "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
-    CommandParameter scenes_getSceneMembership_groupId_commandParameter =
+    CommandParameter scenesgetSceneMembershipgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
+<<<<<<< HEAD
     scenes_getSceneMembership_commandParams.put(
         "groupId", scenes_getSceneMembership_groupId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesgetSceneMembershipCommandParams.put(
+        "groupId", scenesgetSceneMembershipgroupIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_getSceneMembership_CommandInfo =
+    CommandInfo scenesgetSceneMembershipCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15857,6 +17289,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("groupId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             scenes_getSceneMembership_commandParams);
     scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
@@ -15878,25 +17311,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_recallScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedGetSceneMembershipResponseCallback(),
+            scenesgetSceneMembershipCommandParams);
+    scenesClusterCommandInfo.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
+    Map<String, CommandParameter> scenesrecallSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_recallScene_commandParameter =
+    CommandParameter scenesrecallSceneCommandParameter =
         new CommandParameter("Scenes", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter scenes_recallScene_groupId_commandParameter =
+    CommandParameter scenesrecallScenegroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_recallScene_commandParams.put("groupId", scenes_recallScene_groupId_commandParameter);
+    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameter);
 
-    CommandParameter scenes_recallScene_sceneId_commandParameter =
+    CommandParameter scenesrecallScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
-    scenes_recallScene_commandParams.put("sceneId", scenes_recallScene_sceneId_commandParameter);
+    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameter);
 
-    CommandParameter scenes_recallScene_transitionTime_commandParameter =
+    CommandParameter scenesrecallScenetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
+<<<<<<< HEAD
     scenes_recallScene_commandParams.put(
         "transitionTime", scenes_recallScene_transitionTime_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesrecallSceneCommandParams.put(
+        "transitionTime", scenesrecallScenetransitionTimeCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_recallScene_CommandInfo =
+    CommandInfo scenesrecallSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15911,6 +17356,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             scenes_recallScene_commandParams);
     scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
 <<<<<<< HEAD
@@ -15923,18 +17369,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_removeAllScenes_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            scenesrecallSceneCommandParams);
+    scenesClusterCommandInfo.put("recallScene", scenesrecallSceneCommandInfo);
+    Map<String, CommandParameter> scenesremoveAllScenesCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_removeAllScenes_commandParameter =
+    CommandParameter scenesremoveAllScenesCommandParameter =
         new CommandParameter(
             "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
-    CommandParameter scenes_removeAllScenes_groupId_commandParameter =
+    CommandParameter scenesremoveAllScenesgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
+<<<<<<< HEAD
     scenes_removeAllScenes_commandParams.put(
         "groupId", scenes_removeAllScenes_groupId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesremoveAllScenesCommandParams.put("groupId", scenesremoveAllScenesgroupIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_removeAllScenes_CommandInfo =
+    CommandInfo scenesremoveAllScenesCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15946,6 +17402,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("groupId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             scenes_removeAllScenes_commandParams);
     scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
@@ -15963,21 +17420,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_removeScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedRemoveAllScenesResponseCallback(),
+            scenesremoveAllScenesCommandParams);
+    scenesClusterCommandInfo.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
+    Map<String, CommandParameter> scenesremoveSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_removeScene_commandParameter =
+    CommandParameter scenesremoveSceneCommandParameter =
         new CommandParameter(
             "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
-    CommandParameter scenes_removeScene_groupId_commandParameter =
+    CommandParameter scenesremoveScenegroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_removeScene_commandParams.put("groupId", scenes_removeScene_groupId_commandParameter);
+    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameter);
 
-    CommandParameter scenes_removeScene_sceneId_commandParameter =
+    CommandParameter scenesremoveScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
+<<<<<<< HEAD
     scenes_removeScene_commandParams.put("sceneId", scenes_removeScene_sceneId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_removeScene_CommandInfo =
+    CommandInfo scenesremoveSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -15990,6 +17458,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("sceneId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             scenes_removeScene_commandParams);
     scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
@@ -16007,20 +17476,31 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_storeScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedRemoveSceneResponseCallback(),
+            scenesremoveSceneCommandParams);
+    scenesClusterCommandInfo.put("removeScene", scenesremoveSceneCommandInfo);
+    Map<String, CommandParameter> scenesstoreSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_storeScene_commandParameter =
+    CommandParameter scenesstoreSceneCommandParameter =
         new CommandParameter("Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
-    CommandParameter scenes_storeScene_groupId_commandParameter =
+    CommandParameter scenesstoreScenegroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_storeScene_commandParams.put("groupId", scenes_storeScene_groupId_commandParameter);
+    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameter);
 
-    CommandParameter scenes_storeScene_sceneId_commandParameter =
+    CommandParameter scenesstoreScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
+<<<<<<< HEAD
     scenes_storeScene_commandParams.put("sceneId", scenes_storeScene_sceneId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_storeScene_CommandInfo =
+    CommandInfo scenesstoreSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16033,6 +17513,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("sceneId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             scenes_storeScene_commandParams);
     scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
@@ -16050,20 +17531,31 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> scenes_viewScene_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedStoreSceneResponseCallback(),
+            scenesstoreSceneCommandParams);
+    scenesClusterCommandInfo.put("storeScene", scenesstoreSceneCommandInfo);
+    Map<String, CommandParameter> scenesviewSceneCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter scenes_viewScene_commandParameter =
+    CommandParameter scenesviewSceneCommandParameter =
         new CommandParameter("Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
-    CommandParameter scenes_viewScene_groupId_commandParameter =
+    CommandParameter scenesviewScenegroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
-    scenes_viewScene_commandParams.put("groupId", scenes_viewScene_groupId_commandParameter);
+    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameter);
 
-    CommandParameter scenes_viewScene_sceneId_commandParameter =
+    CommandParameter scenesviewScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
+<<<<<<< HEAD
     scenes_viewScene_commandParams.put("sceneId", scenes_viewScene_sceneId_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo scenes_viewScene_CommandInfo =
+    CommandInfo scenesviewSceneCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16076,13 +17568,14 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("sceneId"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_viewScene_commandParams);
-    scenes_ClusterCommandInfo.put("viewScene", scenes_viewScene_CommandInfo);
+            () -> new DelegatedViewSceneResponseCallback(),
+            scenesviewSceneCommandParams);
+    scenesClusterCommandInfo.put("viewScene", scenesviewSceneCommandInfo);
     // Populate cluster
-    ClusterInfo scenes_clusterInfo =
+    ClusterInfo scenesClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId),
+<<<<<<< HEAD
             scenes_ClusterCommandInfo);
     clusterMap.put("scenes", scenes_clusterInfo);
     Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
@@ -16093,12 +17586,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> softwareDiagnostics_resetWatermarks_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            scenesClusterCommandInfo);
+    clusterMap.put("scenes", scenesClusterInfo);
+    Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> softwareDiagnosticsresetWatermarksCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter softwareDiagnostics_resetWatermarks_commandParameter =
+    CommandParameter softwareDiagnosticsresetWatermarksCommandParameter =
         new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo softwareDiagnostics_resetWatermarks_CommandInfo =
+    CommandInfo softwareDiagnosticsresetWatermarksCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16109,20 +17609,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            softwareDiagnostics_resetWatermarks_commandParams);
-    softwareDiagnostics_ClusterCommandInfo.put(
-        "resetWatermarks", softwareDiagnostics_resetWatermarks_CommandInfo);
+            softwareDiagnosticsresetWatermarksCommandParams);
+    softwareDiagnosticsClusterCommandInfo.put(
+        "resetWatermarks", softwareDiagnosticsresetWatermarksCommandInfo);
     // Populate cluster
-    ClusterInfo softwareDiagnostics_clusterInfo =
+    ClusterInfo softwareDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
-            softwareDiagnostics_ClusterCommandInfo);
-    clusterMap.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
-    Map<String, CommandInfo> switch_ClusterCommandInfo = new HashMap<>();
+            softwareDiagnosticsClusterCommandInfo);
+    clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
+    Map<String, CommandInfo> switchClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo switch_clusterInfo =
+    ClusterInfo switchClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId),
+<<<<<<< HEAD
             switch_ClusterCommandInfo);
     clusterMap.put("switch", switch_clusterInfo);
     Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
@@ -16136,18 +17637,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> tvChannel_changeChannel_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            switchClusterCommandInfo);
+    clusterMap.put("switch", switchClusterInfo);
+    Map<String, CommandInfo> tvChannelClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> tvChannelchangeChannelCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter tvChannel_changeChannel_commandParameter =
+    CommandParameter tvChannelchangeChannelCommandParameter =
         new CommandParameter(
             "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
-    CommandParameter tvChannel_changeChannel_match_commandParameter =
+    CommandParameter tvChannelchangeChannelmatchCommandParameter =
         new CommandParameter("match", String.class);
+<<<<<<< HEAD
     tvChannel_changeChannel_commandParams.put(
         "match", tvChannel_changeChannel_match_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    tvChannelchangeChannelCommandParams.put("match", tvChannelchangeChannelmatchCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo tvChannel_changeChannel_CommandInfo =
+    CommandInfo tvChannelchangeChannelCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16159,6 +17671,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("match"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             tvChannel_changeChannel_commandParams);
     tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
@@ -16178,22 +17691,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> tvChannel_changeChannelByNumber_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedChangeChannelResponseCallback(),
+            tvChannelchangeChannelCommandParams);
+    tvChannelClusterCommandInfo.put("changeChannel", tvChannelchangeChannelCommandInfo);
+    Map<String, CommandParameter> tvChannelchangeChannelByNumberCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter tvChannel_changeChannelByNumber_commandParameter =
+    CommandParameter tvChannelchangeChannelByNumberCommandParameter =
         new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter tvChannel_changeChannelByNumber_majorNumber_commandParameter =
+    CommandParameter tvChannelchangeChannelByNumbermajorNumberCommandParameter =
         new CommandParameter("majorNumber", int.class);
-    tvChannel_changeChannelByNumber_commandParams.put(
-        "majorNumber", tvChannel_changeChannelByNumber_majorNumber_commandParameter);
+    tvChannelchangeChannelByNumberCommandParams.put(
+        "majorNumber", tvChannelchangeChannelByNumbermajorNumberCommandParameter);
 
-    CommandParameter tvChannel_changeChannelByNumber_minorNumber_commandParameter =
+    CommandParameter tvChannelchangeChannelByNumberminorNumberCommandParameter =
         new CommandParameter("minorNumber", int.class);
+<<<<<<< HEAD
     tvChannel_changeChannelByNumber_commandParams.put(
         "minorNumber", tvChannel_changeChannelByNumber_minorNumber_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    tvChannelchangeChannelByNumberCommandParams.put(
+        "minorNumber", tvChannelchangeChannelByNumberminorNumberCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo tvChannel_changeChannelByNumber_CommandInfo =
+    CommandInfo tvChannelchangeChannelByNumberCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16207,6 +17732,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             tvChannel_changeChannelByNumber_commandParams);
     tvChannel_ClusterCommandInfo.put(
         "changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
@@ -16219,16 +17745,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> tvChannel_skipChannel_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            tvChannelchangeChannelByNumberCommandParams);
+    tvChannelClusterCommandInfo.put(
+        "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
+    Map<String, CommandParameter> tvChannelskipChannelCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter tvChannel_skipChannel_commandParameter =
+    CommandParameter tvChannelskipChannelCommandParameter =
         new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter tvChannel_skipChannel_count_commandParameter =
+    CommandParameter tvChannelskipChannelcountCommandParameter =
         new CommandParameter("count", int.class);
+<<<<<<< HEAD
     tvChannel_skipChannel_commandParams.put("count", tvChannel_skipChannel_count_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    tvChannelskipChannelCommandParams.put("count", tvChannelskipChannelcountCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo tvChannel_skipChannel_CommandInfo =
+    CommandInfo tvChannelskipChannelCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16240,12 +17777,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            tvChannel_skipChannel_commandParams);
-    tvChannel_ClusterCommandInfo.put("skipChannel", tvChannel_skipChannel_CommandInfo);
+            tvChannelskipChannelCommandParams);
+    tvChannelClusterCommandInfo.put("skipChannel", tvChannelskipChannelCommandInfo);
     // Populate cluster
-    ClusterInfo tvChannel_clusterInfo =
+    ClusterInfo tvChannelClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId),
+<<<<<<< HEAD
             tvChannel_ClusterCommandInfo);
     clusterMap.put("tvChannel", tvChannel_clusterInfo);
     Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
@@ -16263,24 +17801,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> targetNavigator_navigateTarget_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            tvChannelClusterCommandInfo);
+    clusterMap.put("tvChannel", tvChannelClusterInfo);
+    Map<String, CommandInfo> targetNavigatorClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> targetNavigatornavigateTargetCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter targetNavigator_navigateTarget_commandParameter =
+    CommandParameter targetNavigatornavigateTargetCommandParameter =
         new CommandParameter(
             "TargetNavigator",
             ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
-    CommandParameter targetNavigator_navigateTarget_target_commandParameter =
+    CommandParameter targetNavigatornavigateTargettargetCommandParameter =
         new CommandParameter("target", int.class);
-    targetNavigator_navigateTarget_commandParams.put(
-        "target", targetNavigator_navigateTarget_target_commandParameter);
+    targetNavigatornavigateTargetCommandParams.put(
+        "target", targetNavigatornavigateTargettargetCommandParameter);
 
-    CommandParameter targetNavigator_navigateTarget_data_commandParameter =
+    CommandParameter targetNavigatornavigateTargetdataCommandParameter =
         new CommandParameter("data", String.class);
+<<<<<<< HEAD
     targetNavigator_navigateTarget_commandParams.put(
         "data", targetNavigator_navigateTarget_data_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    targetNavigatornavigateTargetCommandParams.put(
+        "data", targetNavigatornavigateTargetdataCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo targetNavigator_navigateTarget_CommandInfo =
+    CommandInfo targetNavigatornavigateTargetCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16293,21 +17843,22 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (String) commandArguments.get("data"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
-            targetNavigator_navigateTarget_commandParams);
-    targetNavigator_ClusterCommandInfo.put(
-        "navigateTarget", targetNavigator_navigateTarget_CommandInfo);
+            () -> new DelegatedNavigateTargetResponseCallback(),
+            targetNavigatornavigateTargetCommandParams);
+    targetNavigatorClusterCommandInfo.put(
+        "navigateTarget", targetNavigatornavigateTargetCommandInfo);
     // Populate cluster
-    ClusterInfo targetNavigator_clusterInfo =
+    ClusterInfo targetNavigatorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId),
-            targetNavigator_ClusterCommandInfo);
-    clusterMap.put("targetNavigator", targetNavigator_clusterInfo);
-    Map<String, CommandInfo> temperatureMeasurement_ClusterCommandInfo = new HashMap<>();
+            targetNavigatorClusterCommandInfo);
+    clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
+    Map<String, CommandInfo> temperatureMeasurementClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo temperatureMeasurement_clusterInfo =
+    ClusterInfo temperatureMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
             temperatureMeasurement_ClusterCommandInfo);
     clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
     Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
@@ -16318,12 +17869,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> testCluster_test_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            temperatureMeasurementClusterCommandInfo);
+    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
+    Map<String, CommandInfo> testClusterClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> testClustertestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter testCluster_test_commandParameter =
+    CommandParameter testClustertestCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo testCluster_test_CommandInfo =
+    CommandInfo testClustertestCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16333,6 +17891,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             testCluster_test_commandParams);
     testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
 <<<<<<< HEAD
@@ -16349,23 +17908,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> testCluster_testAddArguments_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            testClustertestCommandParams);
+    testClusterClusterCommandInfo.put("test", testClustertestCommandInfo);
+    Map<String, CommandParameter> testClustertestAddArgumentsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter testCluster_testAddArguments_commandParameter =
+    CommandParameter testClustertestAddArgumentsCommandParameter =
         new CommandParameter(
             "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
-    CommandParameter testCluster_testAddArguments_arg1_commandParameter =
+    CommandParameter testClustertestAddArgumentsarg1CommandParameter =
         new CommandParameter("arg1", int.class);
-    testCluster_testAddArguments_commandParams.put(
-        "arg1", testCluster_testAddArguments_arg1_commandParameter);
+    testClustertestAddArgumentsCommandParams.put(
+        "arg1", testClustertestAddArgumentsarg1CommandParameter);
 
-    CommandParameter testCluster_testAddArguments_arg2_commandParameter =
+    CommandParameter testClustertestAddArgumentsarg2CommandParameter =
         new CommandParameter("arg2", int.class);
+<<<<<<< HEAD
     testCluster_testAddArguments_commandParams.put(
         "arg2", testCluster_testAddArguments_arg2_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    testClustertestAddArgumentsCommandParams.put(
+        "arg2", testClustertestAddArgumentsarg2CommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo testCluster_testAddArguments_CommandInfo =
+    CommandInfo testClustertestAddArgumentsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16378,6 +17948,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (Integer) commandArguments.get("arg2"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testAddArguments_commandParams);
     testCluster_ClusterCommandInfo.put(
@@ -16389,12 +17960,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> testCluster_testNotHandled_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedTestAddArgumentsResponseCallback(),
+            testClustertestAddArgumentsCommandParams);
+    testClusterClusterCommandInfo.put("testAddArguments", testClustertestAddArgumentsCommandInfo);
+    Map<String, CommandParameter> testClustertestNotHandledCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter testCluster_testNotHandled_commandParameter =
+    CommandParameter testClustertestNotHandledCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo testCluster_testNotHandled_CommandInfo =
+    CommandInfo testClustertestNotHandledCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16405,6 +17983,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             testCluster_testNotHandled_commandParams);
     testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
 <<<<<<< HEAD
@@ -16414,13 +17993,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> testCluster_testSpecific_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            testClustertestNotHandledCommandParams);
+    testClusterClusterCommandInfo.put("testNotHandled", testClustertestNotHandledCommandInfo);
+    Map<String, CommandParameter> testClustertestSpecificCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter testCluster_testSpecific_commandParameter =
+    CommandParameter testClustertestSpecificCommandParameter =
         new CommandParameter(
             "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo testCluster_testSpecific_CommandInfo =
+    CommandInfo testClustertestSpecificCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16431,6 +18016,7 @@ public Map<String, ClusterInfo> getClusterMap() {
                       (ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback);
 >>>>>>> 677ef48a5 (callback generation done)
             },
+<<<<<<< HEAD
             () -> new DelegatedDefaultClusterCallback(),
             testCluster_testSpecific_commandParams);
     testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
@@ -16441,12 +18027,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> testCluster_testUnknownCommand_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            () -> new DelegatedTestSpecificResponseCallback(),
+            testClustertestSpecificCommandParams);
+    testClusterClusterCommandInfo.put("testSpecific", testClustertestSpecificCommandInfo);
+    Map<String, CommandParameter> testClustertestUnknownCommandCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter testCluster_testUnknownCommand_commandParameter =
+    CommandParameter testClustertestUnknownCommandCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo testCluster_testUnknownCommand_CommandInfo =
+    CommandInfo testClustertestUnknownCommandCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16457,13 +18050,14 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            testCluster_testUnknownCommand_commandParams);
-    testCluster_ClusterCommandInfo.put(
-        "testUnknownCommand", testCluster_testUnknownCommand_CommandInfo);
+            testClustertestUnknownCommandCommandParams);
+    testClusterClusterCommandInfo.put(
+        "testUnknownCommand", testClustertestUnknownCommandCommandInfo);
     // Populate cluster
-    ClusterInfo testCluster_clusterInfo =
+    ClusterInfo testClusterClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
+<<<<<<< HEAD
             testCluster_ClusterCommandInfo);
     clusterMap.put("testCluster", testCluster_clusterInfo);
     Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
@@ -16474,12 +18068,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> thermostat_clearWeeklySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            testClusterClusterCommandInfo);
+    clusterMap.put("testCluster", testClusterClusterInfo);
+    Map<String, CommandInfo> thermostatClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> thermostatclearWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter thermostat_clearWeeklySchedule_commandParameter =
+    CommandParameter thermostatclearWeeklyScheduleCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo thermostat_clearWeeklySchedule_CommandInfo =
+    CommandInfo thermostatclearWeeklyScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16490,6 +18091,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             thermostat_clearWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
@@ -16500,12 +18102,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> thermostat_getRelayStatusLog_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            thermostatclearWeeklyScheduleCommandParams);
+    thermostatClusterCommandInfo.put(
+        "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
+    Map<String, CommandParameter> thermostatgetRelayStatusLogCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter thermostat_getRelayStatusLog_commandParameter =
+    CommandParameter thermostatgetRelayStatusLogCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo thermostat_getRelayStatusLog_CommandInfo =
+    CommandInfo thermostatgetRelayStatusLogCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16516,6 +18125,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             thermostat_getRelayStatusLog_commandParams);
     thermostat_ClusterCommandInfo.put(
         "getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
@@ -16533,22 +18143,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> thermostat_getWeeklySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            thermostatgetRelayStatusLogCommandParams);
+    thermostatClusterCommandInfo.put("getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
+    Map<String, CommandParameter> thermostatgetWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter thermostat_getWeeklySchedule_commandParameter =
+    CommandParameter thermostatgetWeeklyScheduleCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostat_getWeeklySchedule_daysToReturn_commandParameter =
+    CommandParameter thermostatgetWeeklyScheduledaysToReturnCommandParameter =
         new CommandParameter("daysToReturn", int.class);
-    thermostat_getWeeklySchedule_commandParams.put(
-        "daysToReturn", thermostat_getWeeklySchedule_daysToReturn_commandParameter);
+    thermostatgetWeeklyScheduleCommandParams.put(
+        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameter);
 
-    CommandParameter thermostat_getWeeklySchedule_modeToReturn_commandParameter =
+    CommandParameter thermostatgetWeeklySchedulemodeToReturnCommandParameter =
         new CommandParameter("modeToReturn", int.class);
+<<<<<<< HEAD
     thermostat_getWeeklySchedule_commandParams.put(
         "modeToReturn", thermostat_getWeeklySchedule_modeToReturn_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    thermostatgetWeeklyScheduleCommandParams.put(
+        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo thermostat_getWeeklySchedule_CommandInfo =
+    CommandInfo thermostatgetWeeklyScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16562,6 +18183,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             thermostat_getWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
@@ -16590,33 +18212,44 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> thermostat_setWeeklySchedule_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            thermostatgetWeeklyScheduleCommandParams);
+    thermostatClusterCommandInfo.put("getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
+    Map<String, CommandParameter> thermostatsetWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter thermostat_setWeeklySchedule_commandParameter =
+    CommandParameter thermostatsetWeeklyScheduleCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter =
+    CommandParameter thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameter =
         new CommandParameter("numberOfTransitionsForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.put(
+    thermostatsetWeeklyScheduleCommandParams.put(
         "numberOfTransitionsForSequence",
-        thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
+        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameter);
 
-    CommandParameter thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter =
+    CommandParameter thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameter =
         new CommandParameter("dayOfWeekForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.put(
-        "dayOfWeekForSequence", thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "dayOfWeekForSequence", thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameter);
 
-    CommandParameter thermostat_setWeeklySchedule_modeForSequence_commandParameter =
+    CommandParameter thermostatsetWeeklySchedulemodeForSequenceCommandParameter =
         new CommandParameter("modeForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.put(
-        "modeForSequence", thermostat_setWeeklySchedule_modeForSequence_commandParameter);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameter);
 
-    CommandParameter thermostat_setWeeklySchedule_payload_commandParameter =
+    CommandParameter thermostatsetWeeklySchedulepayloadCommandParameter =
         new CommandParameter("payload", int.class);
+<<<<<<< HEAD
     thermostat_setWeeklySchedule_commandParams.put(
         "payload", thermostat_setWeeklySchedule_payload_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "payload", thermostatsetWeeklySchedulepayloadCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo thermostat_setWeeklySchedule_CommandInfo =
+    CommandInfo thermostatsetWeeklyScheduleCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16632,6 +18265,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             thermostat_setWeeklySchedule_commandParams);
     thermostat_ClusterCommandInfo.put(
         "setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
@@ -16649,22 +18283,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> thermostat_setpointRaiseLower_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            thermostatsetWeeklyScheduleCommandParams);
+    thermostatClusterCommandInfo.put("setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
+    Map<String, CommandParameter> thermostatsetpointRaiseLowerCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter thermostat_setpointRaiseLower_commandParameter =
+    CommandParameter thermostatsetpointRaiseLowerCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostat_setpointRaiseLower_mode_commandParameter =
+    CommandParameter thermostatsetpointRaiseLowermodeCommandParameter =
         new CommandParameter("mode", int.class);
-    thermostat_setpointRaiseLower_commandParams.put(
-        "mode", thermostat_setpointRaiseLower_mode_commandParameter);
+    thermostatsetpointRaiseLowerCommandParams.put(
+        "mode", thermostatsetpointRaiseLowermodeCommandParameter);
 
-    CommandParameter thermostat_setpointRaiseLower_amount_commandParameter =
+    CommandParameter thermostatsetpointRaiseLoweramountCommandParameter =
         new CommandParameter("amount", int.class);
+<<<<<<< HEAD
     thermostat_setpointRaiseLower_commandParams.put(
         "amount", thermostat_setpointRaiseLower_amount_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    thermostatsetpointRaiseLowerCommandParams.put(
+        "amount", thermostatsetpointRaiseLoweramountCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo thermostat_setpointRaiseLower_CommandInfo =
+    CommandInfo thermostatsetpointRaiseLowerCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16678,24 +18323,24 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            thermostat_setpointRaiseLower_commandParams);
-    thermostat_ClusterCommandInfo.put(
-        "setpointRaiseLower", thermostat_setpointRaiseLower_CommandInfo);
+            thermostatsetpointRaiseLowerCommandParams);
+    thermostatClusterCommandInfo.put("setpointRaiseLower", thermostatsetpointRaiseLowerCommandInfo);
     // Populate cluster
-    ClusterInfo thermostat_clusterInfo =
+    ClusterInfo thermostatClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
-            thermostat_ClusterCommandInfo);
-    clusterMap.put("thermostat", thermostat_clusterInfo);
-    Map<String, CommandInfo> thermostatUserInterfaceConfiguration_ClusterCommandInfo =
-        new HashMap<>();
+            thermostatClusterCommandInfo);
+    clusterMap.put("thermostat", thermostatClusterInfo);
+    Map<String, CommandInfo> thermostatUserInterfaceConfigurationClusterCommandInfo =
+        new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo =
+    ClusterInfo thermostatUserInterfaceConfigurationClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
-            thermostatUserInterfaceConfiguration_ClusterCommandInfo);
+            thermostatUserInterfaceConfigurationClusterCommandInfo);
     clusterMap.put(
+<<<<<<< HEAD
         "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
     Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
 <<<<<<< HEAD
@@ -16705,12 +18350,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
+    Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> threadNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter threadNetworkDiagnostics_resetCounts_commandParameter =
+    CommandParameter threadNetworkDiagnosticsresetCountsCommandParameter =
         new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo threadNetworkDiagnostics_resetCounts_CommandInfo =
+    CommandInfo threadNetworkDiagnosticsresetCountsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16721,20 +18372,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            threadNetworkDiagnostics_resetCounts_commandParams);
-    threadNetworkDiagnostics_ClusterCommandInfo.put(
-        "resetCounts", threadNetworkDiagnostics_resetCounts_CommandInfo);
+            threadNetworkDiagnosticsresetCountsCommandParams);
+    threadNetworkDiagnosticsClusterCommandInfo.put(
+        "resetCounts", threadNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
-    ClusterInfo threadNetworkDiagnostics_clusterInfo =
+    ClusterInfo threadNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
-            threadNetworkDiagnostics_ClusterCommandInfo);
-    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
-    Map<String, CommandInfo> wakeOnLan_ClusterCommandInfo = new HashMap<>();
+            threadNetworkDiagnosticsClusterCommandInfo);
+    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
+    Map<String, CommandInfo> wakeOnLanClusterCommandInfo = new LinkedHashMap<>();
     // Populate cluster
-    ClusterInfo wakeOnLan_clusterInfo =
+    ClusterInfo wakeOnLanClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
+<<<<<<< HEAD
             wakeOnLan_ClusterCommandInfo);
     clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
     Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
@@ -16745,12 +18397,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            wakeOnLanClusterCommandInfo);
+    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
+    Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> wiFiNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter wiFiNetworkDiagnostics_resetCounts_commandParameter =
+    CommandParameter wiFiNetworkDiagnosticsresetCountsCommandParameter =
         new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo wiFiNetworkDiagnostics_resetCounts_CommandInfo =
+    CommandInfo wiFiNetworkDiagnosticsresetCountsCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16761,13 +18420,14 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            wiFiNetworkDiagnostics_resetCounts_commandParams);
-    wiFiNetworkDiagnostics_ClusterCommandInfo.put(
-        "resetCounts", wiFiNetworkDiagnostics_resetCounts_CommandInfo);
+            wiFiNetworkDiagnosticsresetCountsCommandParams);
+    wiFiNetworkDiagnosticsClusterCommandInfo.put(
+        "resetCounts", wiFiNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
-    ClusterInfo wiFiNetworkDiagnostics_clusterInfo =
+    ClusterInfo wiFiNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
+<<<<<<< HEAD
             wiFiNetworkDiagnostics_ClusterCommandInfo);
     clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
     Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
@@ -16778,12 +18438,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> windowCovering_downOrClose_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            wiFiNetworkDiagnosticsClusterCommandInfo);
+    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
+    Map<String, CommandInfo> windowCoveringClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandParameter> windowCoveringdownOrCloseCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_downOrClose_commandParameter =
+    CommandParameter windowCoveringdownOrCloseCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo windowCovering_downOrClose_CommandInfo =
+    CommandInfo windowCoveringdownOrCloseCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16794,6 +18461,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_downOrClose_commandParams);
     windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
 <<<<<<< HEAD
@@ -16812,24 +18480,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> windowCovering_goToLiftPercentage_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringdownOrCloseCommandParams);
+    windowCoveringClusterCommandInfo.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
+    Map<String, CommandParameter> windowCoveringgoToLiftPercentageCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_goToLiftPercentage_commandParameter =
+    CommandParameter windowCoveringgoToLiftPercentageCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter =
+    CommandParameter windowCoveringgoToLiftPercentageliftPercentageValueCommandParameter =
         new CommandParameter("liftPercentageValue", int.class);
-    windowCovering_goToLiftPercentage_commandParams.put(
-        "liftPercentageValue",
-        windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter);
+    windowCoveringgoToLiftPercentageCommandParams.put(
+        "liftPercentageValue", windowCoveringgoToLiftPercentageliftPercentageValueCommandParameter);
 
-    CommandParameter windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter =
+    CommandParameter windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameter =
         new CommandParameter("liftPercent100thsValue", int.class);
-    windowCovering_goToLiftPercentage_commandParams.put(
+    windowCoveringgoToLiftPercentageCommandParams.put(
         "liftPercent100thsValue",
+<<<<<<< HEAD
         windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo windowCovering_goToLiftPercentage_CommandInfo =
+    CommandInfo windowCoveringgoToLiftPercentageCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16843,6 +18520,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_goToLiftPercentage_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
@@ -16856,17 +18534,29 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> windowCovering_goToLiftValue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringgoToLiftPercentageCommandParams);
+    windowCoveringClusterCommandInfo.put(
+        "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
+    Map<String, CommandParameter> windowCoveringgoToLiftValueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_goToLiftValue_commandParameter =
+    CommandParameter windowCoveringgoToLiftValueCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCovering_goToLiftValue_liftValue_commandParameter =
+    CommandParameter windowCoveringgoToLiftValueliftValueCommandParameter =
         new CommandParameter("liftValue", int.class);
+<<<<<<< HEAD
     windowCovering_goToLiftValue_commandParams.put(
         "liftValue", windowCovering_goToLiftValue_liftValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    windowCoveringgoToLiftValueCommandParams.put(
+        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo windowCovering_goToLiftValue_CommandInfo =
+    CommandInfo windowCoveringgoToLiftValueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16879,6 +18569,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_goToLiftValue_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
@@ -16898,24 +18589,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     Map<String, CommandParameter> windowCovering_goToTiltPercentage_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringgoToLiftValueCommandParams);
+    windowCoveringClusterCommandInfo.put("goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
+    Map<String, CommandParameter> windowCoveringgoToTiltPercentageCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_goToTiltPercentage_commandParameter =
+    CommandParameter windowCoveringgoToTiltPercentageCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter =
+    CommandParameter windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameter =
         new CommandParameter("tiltPercentageValue", int.class);
-    windowCovering_goToTiltPercentage_commandParams.put(
-        "tiltPercentageValue",
-        windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter);
+    windowCoveringgoToTiltPercentageCommandParams.put(
+        "tiltPercentageValue", windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameter);
 
-    CommandParameter windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter =
+    CommandParameter windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameter =
         new CommandParameter("tiltPercent100thsValue", int.class);
-    windowCovering_goToTiltPercentage_commandParams.put(
+    windowCoveringgoToTiltPercentageCommandParams.put(
         "tiltPercent100thsValue",
+<<<<<<< HEAD
         windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
 
     // Populate commands
-    CommandInfo windowCovering_goToTiltPercentage_CommandInfo =
+    CommandInfo windowCoveringgoToTiltPercentageCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16929,6 +18629,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_goToTiltPercentage_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
@@ -16963,17 +18664,24 @@ >>>>>>> a4fd0282e (no error code generation)
 =======
     Map<String, CommandParameter> windowCovering_goToTiltValue_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringgoToTiltPercentageCommandParams);
+    windowCoveringClusterCommandInfo.put(
+        "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
+    Map<String, CommandParameter> windowCoveringgoToTiltValueCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_goToTiltValue_commandParameter =
+    CommandParameter windowCoveringgoToTiltValueCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCovering_goToTiltValue_tiltValue_commandParameter =
+    CommandParameter windowCoveringgoToTiltValuetiltValueCommandParameter =
         new CommandParameter("tiltValue", int.class);
-    windowCovering_goToTiltValue_commandParams.put(
-        "tiltValue", windowCovering_goToTiltValue_tiltValue_commandParameter);
+    windowCoveringgoToTiltValueCommandParams.put(
+        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameter);
 
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo windowCovering_goToTiltValue_CommandInfo =
+    CommandInfo windowCoveringgoToTiltValueCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -16986,6 +18694,7 @@ >>>>>>> a4fd0282e (no error code generation)
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_goToTiltValue_commandParams);
     windowCovering_ClusterCommandInfo.put(
         "goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
@@ -16996,12 +18705,18 @@ >>>>>>> a4fd0282e (no error code generation)
 =======
     Map<String, CommandParameter> windowCovering_stopMotion_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringgoToTiltValueCommandParams);
+    windowCoveringClusterCommandInfo.put("goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
+    Map<String, CommandParameter> windowCoveringstopMotionCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_stopMotion_commandParameter =
+    CommandParameter windowCoveringstopMotionCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo windowCovering_stopMotion_CommandInfo =
+    CommandInfo windowCoveringstopMotionCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -17012,6 +18727,7 @@ >>>>>>> a4fd0282e (no error code generation)
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
+<<<<<<< HEAD
             windowCovering_stopMotion_commandParams);
     windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
 <<<<<<< HEAD
@@ -17021,12 +18737,18 @@ >>>>>>> a4fd0282e (no error code generation)
 =======
     Map<String, CommandParameter> windowCovering_upOrOpen_commandParams =
         new HashMap<String, CommandParameter>();
+=======
+            windowCoveringstopMotionCommandParams);
+    windowCoveringClusterCommandInfo.put("stopMotion", windowCoveringstopMotionCommandInfo);
+    Map<String, CommandParameter> windowCoveringupOrOpenCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+>>>>>>> 41b0956c1 (on/off commands working)
     // TODO: fill out parameter types
-    CommandParameter windowCovering_upOrOpen_commandParameter =
+    CommandParameter windowCoveringupOrOpenCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
-    CommandInfo windowCovering_upOrOpen_CommandInfo =
+    CommandInfo windowCoveringupOrOpenCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
 <<<<<<< HEAD
@@ -17037,14 +18759,14 @@ >>>>>>> a4fd0282e (no error code generation)
 >>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
-            windowCovering_upOrOpen_commandParams);
-    windowCovering_ClusterCommandInfo.put("upOrOpen", windowCovering_upOrOpen_CommandInfo);
+            windowCoveringupOrOpenCommandParams);
+    windowCoveringClusterCommandInfo.put("upOrOpen", windowCoveringupOrOpenCommandInfo);
     // Populate cluster
-    ClusterInfo windowCovering_clusterInfo =
+    ClusterInfo windowCoveringClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
-            windowCovering_ClusterCommandInfo);
-    clusterMap.put("windowCovering", windowCovering_clusterInfo);
+            windowCoveringClusterCommandInfo);
+    clusterMap.put("windowCovering", windowCoveringClusterInfo);
     return clusterMap;
 <<<<<<< HEAD
 >>>>>>> 2d2bbd2e1 (new design solution)

From 5998f2b5dae5e89611e57161518d5eb340d6a52d Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 16:42:50 -0400
Subject: [PATCH 08/38] revert .idea changes

---
 .../CHIPTool/.idea/deploymentTargetDropDown.xml | 17 -----------------
 src/android/CHIPTool/.idea/jarRepositories.xml  |  5 -----
 src/android/CHIPTool/.idea/misc.xml             |  8 --------
 3 files changed, 30 deletions(-)
 delete mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 6d64cf9d63f3de..00000000000000
--- a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="12171FDD4002GB" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-10-18T19:12:25.735665Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/.idea/jarRepositories.xml b/src/android/CHIPTool/.idea/jarRepositories.xml
index e34606ccde7a9d..a5f05cd8c87d4a 100644
--- a/src/android/CHIPTool/.idea/jarRepositories.xml
+++ b/src/android/CHIPTool/.idea/jarRepositories.xml
@@ -21,10 +21,5 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/.idea/misc.xml b/src/android/CHIPTool/.idea/misc.xml
index e3c149217d32ba..6199cc2a4d0e4f 100644
--- a/src/android/CHIPTool/.idea/misc.xml
+++ b/src/android/CHIPTool/.idea/misc.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DesignSurface">
-    <option name="filePathToZoomLevelMap">
-      <map>
-        <entry key="app/src/main/res/layout/cluster_interaction_fragment.xml" value="0.18229166666666666" />
-        <entry key="app/src/main/res/layout/on_off_client_fragment.xml" value="0.18229166666666666" />
-      </map>
-    </option>
-  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

From 134b0b49835c97dac41f0a4af51f68087710371d Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 16:44:19 -0400
Subject: [PATCH 09/38] one more .idea change revert

---
 src/android/CHIPTool/.idea/misc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/CHIPTool/.idea/misc.xml b/src/android/CHIPTool/.idea/misc.xml
index 6199cc2a4d0e4f..37a750962da6f2 100644
--- a/src/android/CHIPTool/.idea/misc.xml
+++ b/src/android/CHIPTool/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

From 0ffbf5bdc4aa937c8f6e79147194b15b6ef665cc Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 17:31:35 -0400
Subject: [PATCH 10/38] remove outline.java

---
 .../java/src/chip/clusterinfo/outline.java    | 179 ------------------
 1 file changed, 179 deletions(-)
 delete mode 100644 src/controller/java/src/chip/clusterinfo/outline.java

diff --git a/src/controller/java/src/chip/clusterinfo/outline.java b/src/controller/java/src/chip/clusterinfo/outline.java
deleted file mode 100644
index c26d15c35cb074..00000000000000
--- a/src/controller/java/src/chip/clusterinfo/outline.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.google.chip.chiptool.clusterclient;
-
-import chip.devicecontroller.ChipClusters.BaseChipCluster;
-import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import chip.devicecontroller.ChipClusters.OnOffCluster;
-import chip.devicecontroller.ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Supplier;
-
-public class ClusterInfo {
-  private final ClusterConstructor createClusterFunction;
-  private final Map<String, CommandInfo> commands;
-
-  public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
-    this.createClusterFunction = createClusterFunction;
-    this.commands = commands;
-  }
-
-  public ClusterConstructor getCreateClusterFunction() {
-    return createClusterFunction;
-  }
-
-  public Map<String, CommandInfo> getCommands() {
-    return commands;
-  }
-
-  @FunctionalInterface
-  interface ClusterConstructor {
-    BaseChipCluster create(Long devicePtr, int endpointId);
-  }
-}
-
-class CommandInfo {
-  private ClusterCommandFunction commandFunction;
-  private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
-  private List<CommandParameter> commandParameters;
-
-
-  public CommandInfo(ClusterCommandFunction commandFunction,
-      Supplier<DelegatedClusterCallback> commandCallbackSupplier, List<CommandParameter> commandParameters) {
-    this.commandFunction = commandFunction;
-    this.commandCallbackSupplier = commandCallbackSupplier;
-    this.commandParameters = commandParameters;
-  }
-
-  public ClusterCommandFunction getCommandFunction() {
-    return commandFunction;
-  }
-
-  public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
-    return commandCallbackSupplier;
-  }
-
-  public List<CommandParameter> getCommandParameters() {
-    return commandParameters;
-  }
-
-  @FunctionalInterface
-  interface ClusterCommandFunction {
-    void invokeCommand(BaseChipCluster cluster, Object callback, List<Object> commandArguments);
-  }
-}
-
-class CommandParameter {
-
-}
-
-// generated code
-interface ClusterCommandCallback {
-  void onSuccess(List<Object> responseValues);
-  void onFailure(Exception exception);
-}
-
-interface DelegatedClusterCallback {
-  void setCallbackDelegate(ClusterCommandCallback callback);
-}
-
-// Demoing DelegatedAttestationResponseCallback since AttestationResponseCallback has non-default success parameters.
-// In the template: Generate a Delegated{{... name}} for every cluster callback type.
-class DelegatedAttestationResponseCallback implements AttestationResponseCallback, DelegatedClusterCallback {
-  private ClusterCommandCallback callback;
-
-  @Override
-  public void setCallbackDelegate(ClusterCommandCallback callback) {
-    this.callback = callback;
-  }
-
-  // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
-  @Override
-  public void onSuccess(byte[] attestationElements, byte[] signature) {
-    List<Object> responseValues = new ArrayList<>();
-    responseValues.add(attestationElements);
-    responseValues.add(signature);
-    callback.onSuccess(responseValues);
-  }
-
-  @Override
-  public void onError(Exception e) {
-    callback.onFailure(e);
-  }
-}
-
-class ExampleCode {
-  // GENERATED CODE: Should be created by the template.
-  static Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = new HashMap<>();
-
-    // Populate parameters
-    List<CommandParameter> commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-    CommandParameter effectId = new CommandParameter();
-    CommandParameter effectVariant = new CommandParameter();
-    commandParams.add(effectId);
-    commandParams.add(effectVariant);
-
-    // Populate commands
-    Map<String, CommandInfo> onOffClusterCommandInfo = new HashMap<>();
-    CommandInfo offWithEffectCommandInfo = new CommandInfo(
-        (cluster, callback, commandArguments) -> {
-          // TODO: expose index in template helper
-          ((OnOffCluster) cluster)
-              .offWithEffect((DefaultClusterCallback) callback, (Integer) commandArguments.get(0),
-                  (Integer) commandArguments.get(1));
-        },
-        // DelegatedDefaultClusterCallback is not implemented in this file, but it's just a simpler DelegatedAttestationResponseCallback that passes an empty responseValues list.
-        () -> new DelegatedDefaultClusterCallback(),
-        commandParams
-    );
-    onOffClusterCommandInfo.put("OffWithEffect", offWithEffectCommandInfo);
-
-    // Populate cluster
-    ClusterInfo onOffClusterInfo = new ClusterInfo(
-        (ptr, endpointId) -> new OnOffCluster(ptr, endpointId), onOffClusterCommandInfo);
-
-    clusterMap.put("OnOff", onOffClusterInfo);
-    return clusterMap;
-  }
-
-
-  // APP CODE: Should be in the ClusterInteractionFragment instead of here.
-  static void accessClusterMap() {
-    Map<String, ClusterInfo> clusterMap = getClusterMap();
-    // In real code: get the device ptr using ChipClient.getConnectedDevicePointer
-    long devicePtr = 0L;
-    // This is hardcoded to 1 for most clusters
-    int endpointId = 1;
-    // In real code: "OnOff" would be selected by the user.
-    ClusterInfo clusterInfo = clusterMap.get("OnOff");
-    BaseChipCluster onOffCluster = clusterInfo.getCreateClusterFunction().create(devicePtr, endpointId);
-
-
-    // Imagine user wants to execute the command "OffWithEffect", pass the string here
-    CommandInfo offWithEffectInfo = clusterInfo.getCommands().get("OffWithEffect");
-    DelegatedClusterCallback callback = offWithEffectInfo.getCommandCallbackSupplier().get();
-
-    callback.setCallbackDelegate(new ClusterCommandCallback() {
-      @Override
-      public void onSuccess(List<Object> responseValues) {
-        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
-      }
-
-      @Override
-      public void onFailure(Exception exception) {
-        // Show some error.
-      }
-    });
-    offWithEffectInfo.getCommandParameters()
-    List<Object> commandArguments = new ArrayList<>();
-    // "effectId"
-    commandArguments.add("effectId", 123);
-    // "effectVariant"
-    commandArguments.add("effectVariant", 456);
-    // How do you know what callback to create?
-    offWithEffectInfo.getCommandFunction().invokeCommand(onOffCluster, null, commandArguments);
-  }
-}
\ No newline at end of file

From da0685dcb930bbb82bf2576e8a7a28f851299098 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 18 Oct 2021 21:36:26 +0000
Subject: [PATCH 11/38] Restyled by whitespace

---
 .../java/src/chip/clusterinfo/ClusterCommandCallback.java     | 4 ++++
 src/controller/java/src/chip/clusterinfo/ClusterInfo.java     | 3 +++
 src/controller/java/src/chip/clusterinfo/CommandInfo.java     | 3 +++
 .../java/src/chip/clusterinfo/CommandParameter.java           | 2 +-
 .../java/src/chip/clusterinfo/DelegatedClusterCallback.java   | 3 +++
 src/controller/java/src/chip/clusterinfo/ParameterType.java   | 2 +-
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index 2e51407e31f13e..d2efbc6208716b 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -15,7 +15,11 @@ public interface ClusterCommandCallback {
 
   void onFailure(Exception exception);
 <<<<<<< HEAD
+<<<<<<< HEAD
 }
 =======
 }
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+}
+>>>>>>> df6a682b0 (Restyled by whitespace)
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 4921b37aca4bf0..710bf6d32b6bb3 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -34,6 +34,7 @@ public interface ClusterConstructor {
     BaseChipCluster create(Long devicePtr, int endpointId);
   }
 }
+<<<<<<< HEAD
 =======
 package chip.devicecontroller;
 =======
@@ -74,3 +75,5 @@ public interface ClusterConstructor {
   }
 }
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+>>>>>>> df6a682b0 (Restyled by whitespace)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 6fb1295ce9b480..4acfa59452eff4 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -110,4 +110,7 @@ public interface ClusterCommandFunction {
     void invokeCommand(BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
 }
+<<<<<<< HEAD
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+>>>>>>> df6a682b0 (Restyled by whitespace)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameter.java b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
index ef192e1923cd89..8b9bbd83ef9401 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameter.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
@@ -10,4 +10,4 @@ public CommandParameter(String name, Class<?> type) {
 
   public String name;
   public Class<?> type;
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index dac45e30e7b458..3aa3e24c32e6a1 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -11,4 +11,7 @@ public interface DelegatedClusterCallback {
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }
+<<<<<<< HEAD
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+>>>>>>> df6a682b0 (Restyled by whitespace)
diff --git a/src/controller/java/src/chip/clusterinfo/ParameterType.java b/src/controller/java/src/chip/clusterinfo/ParameterType.java
index b9a4df60c0dfda..62016fd7541a17 100644
--- a/src/controller/java/src/chip/clusterinfo/ParameterType.java
+++ b/src/controller/java/src/chip/clusterinfo/ParameterType.java
@@ -2,4 +2,4 @@
 
 enum ParameterType {
   CALLBACK, INT, LONG, BOOLEAN, STRUCT
-}
\ No newline at end of file
+}

From 969be5f864ce225e8b0621b41da0d129a189dc0d Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 18 Oct 2021 21:37:07 +0000
Subject: [PATCH 12/38] Restyled by google-java-format

---
 .../clusterinfo/ClusterCommandCallback.java     |  4 ++++
 .../java/src/chip/clusterinfo/ClusterInfo.java  |  5 +++++
 .../java/src/chip/clusterinfo/CommandInfo.java  | 17 ++++++++++++++++-
 .../clusterinfo/DelegatedClusterCallback.java   |  3 +++
 .../src/chip/clusterinfo/ParameterType.java     |  6 +++++-
 5 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index d2efbc6208716b..4e36d3006eb550 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -1,5 +1,6 @@
 package chip.clusterinfo;
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 import java.util.List;
 
@@ -7,6 +8,9 @@
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
 =======
+=======
+
+>>>>>>> 46c963914 (Restyled by google-java-format)
 import java.util.*;
 
 >>>>>>> 2d2bbd2e1 (new design solution)
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 710bf6d32b6bb3..a614f974871f2f 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -2,9 +2,14 @@
 <<<<<<< HEAD
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
+=======
+import chip.devicecontroller.ChipClusters.BaseChipCluster;
+import java.util.*;
+>>>>>>> 46c963914 (Restyled by google-java-format)
 
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
 public class ClusterInfo {
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 4acfa59452eff4..f6a12248582f08 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -2,6 +2,7 @@
 <<<<<<< HEAD
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
@@ -57,21 +58,28 @@ void invokeCommand(
 >>>>>>> 505e97db3 (change package)
 =======
 import java.util.function.Function;
+=======
+import chip.devicecontroller.ChipClusters.BaseChipCluster;
+>>>>>>> 46c963914 (Restyled by google-java-format)
 import java.util.*;
 <<<<<<< HEAD
 >>>>>>> a4fd0282e (no error code generation)
 
 =======
 import java.util.function.Supplier;
+<<<<<<< HEAD
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+>>>>>>> 46c963914 (Restyled by google-java-format)
 
 public class CommandInfo {
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
   private Map<String, CommandParameter> commandParameters;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   public String name;
   public Function<List<CommandParameter>, Class<?>> fn;
@@ -88,6 +96,12 @@ >>>>>>> a4fd0282e (no error code generation)
 
   public CommandInfo(ClusterCommandFunction commandFunction,
       Supplier<DelegatedClusterCallback> commandCallbackSupplier, Map<String, CommandParameter> commandParameters) {
+=======
+  public CommandInfo(
+      ClusterCommandFunction commandFunction,
+      Supplier<DelegatedClusterCallback> commandCallbackSupplier,
+      Map<String, CommandParameter> commandParameters) {
+>>>>>>> 46c963914 (Restyled by google-java-format)
     this.commandFunction = commandFunction;
     this.commandCallbackSupplier = commandCallbackSupplier;
     this.commandParameters = commandParameters;
@@ -107,7 +121,8 @@ public Map<String, CommandParameter> getCommandParameters() {
 
   @FunctionalInterface
   public interface ClusterCommandFunction {
-    void invokeCommand(BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
+    void invokeCommand(
+        BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
 }
 <<<<<<< HEAD
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index 3aa3e24c32e6a1..d8f6c72f2798c1 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -1,5 +1,6 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
 public interface DelegatedClusterCallback {
@@ -7,6 +8,8 @@ public interface DelegatedClusterCallback {
 }
 =======
 import chip.clusterinfo.ClusterCommandCallback;
+=======
+>>>>>>> 46c963914 (Restyled by google-java-format)
 
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
diff --git a/src/controller/java/src/chip/clusterinfo/ParameterType.java b/src/controller/java/src/chip/clusterinfo/ParameterType.java
index 62016fd7541a17..10158f9ea7fd40 100644
--- a/src/controller/java/src/chip/clusterinfo/ParameterType.java
+++ b/src/controller/java/src/chip/clusterinfo/ParameterType.java
@@ -1,5 +1,9 @@
 package chip.clusterinfo;
 
 enum ParameterType {
-  CALLBACK, INT, LONG, BOOLEAN, STRUCT
+  CALLBACK,
+  INT,
+  LONG,
+  BOOLEAN,
+  STRUCT
 }

From 7fd470ce4be2b1b308574af472424f963fe733cd Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 18 Oct 2021 21:37:21 +0000
Subject: [PATCH 13/38] Restyled by gn

---
 src/controller/java/BUILD.gn | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 10f97aa53ddc10..6a9e6545f7e6e5 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -61,20 +61,20 @@ android_library("java") {
     "src/chip/clusterinfo/ClusterCommandCallback.java",
     "src/chip/clusterinfo/ClusterInfo.java",
     "src/chip/clusterinfo/CommandInfo.java",
+<<<<<<< HEAD
     "src/chip/clusterinfo/CommandParameterInfo.java",
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
+=======
+    "src/chip/clusterinfo/CommandParameter.java",
+    "src/chip/clusterinfo/DelegatedClusterCallback.java",
+    "src/chip/clusterinfo/ParameterType.java",
+>>>>>>> 9199ce0a6 (Restyled by gn)
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",
     "src/chip/devicecontroller/ChipDeviceController.java",
     "src/chip/devicecontroller/ChipDeviceControllerException.java",
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
-    "src/chip/clusterinfo/ClusterInfo.java",
-    "src/chip/clusterinfo/CommandInfo.java",
-    "src/chip/clusterinfo/CommandParameter.java",
-    "src/chip/clusterinfo/ParameterType.java",
-    "src/chip/clusterinfo/ClusterCommandCallback.java",
-    "src/chip/clusterinfo/DelegatedClusterCallback.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
 <<<<<<< HEAD
 <<<<<<< HEAD

From d40904f10226c2c3bda9bf42ca895be8637d7e43 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Mon, 18 Oct 2021 21:44:17 +0000
Subject: [PATCH 14/38] Restyled by google-java-format

---
 .../java/src/chip/clusterinfo/DelegatedClusterCallback.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index d8f6c72f2798c1..71dadaf5374723 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -1,5 +1,6 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
@@ -11,6 +12,8 @@ public interface DelegatedClusterCallback {
 =======
 >>>>>>> 46c963914 (Restyled by google-java-format)
 
+=======
+>>>>>>> 9cdded6e6 (Restyled by google-java-format)
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }

From 496946513d1633cc80558c76f28dc31a3a8506b2 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 19:29:42 -0400
Subject: [PATCH 15/38] fix merge

---
 .../CHIPTool/.idea/deploymentTargetDropDown.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000000000..8631f9e2976c8d
--- /dev/null
+++ b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="12171FDD4002GB" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-10-18T22:29:04.867972Z" />
+  </component>
+</project>
\ No newline at end of file

From 401fac5d7398ab4ff8af2375cd6ded5ca90a6d9f Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 18 Oct 2021 19:32:20 -0400
Subject: [PATCH 16/38] merge conflict

---
 .../java/templates/ClusterInfo-java.zapt      |  12 +-
 .../chip/devicecontroller/ChipClusters.java   |  48 ++++++-
 .../devicecontroller/ClusterInfoMapping.java  | 128 ++++++++++++++++++
 3 files changed, 178 insertions(+), 10 deletions(-)

diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 2edf208a60735e..4420293af070e2 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -243,11 +243,11 @@ public class ClusterInfoMapping {
                {{else}}
                  CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
-               {{#chip_cluster_command_arguments}}
+               {{#chip_cluster_command_arguments_with_structs_expanded}}
                  CommandParameter {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
                  {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter);
                  {{#not_last}} {{/not_last}}
-               {{/chip_cluster_command_arguments}}
+               {{/chip_cluster_command_arguments_with_structs_expanded}}
            {{else}}
                {{#if hasSpecificResponse}}
                  CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
@@ -261,11 +261,11 @@ public class ClusterInfoMapping {
                    (cluster, callback, commandArguments) -> {
                        ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
                            .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
-                           {{#chip_cluster_command_arguments}}
+                           {{#chip_cluster_command_arguments_with_structs_expanded}}
                            ,
                               ({{asJavaBoxedType type}})
                             commandArguments.get("{{asLowerCamelCase label}}")
-                       {{/chip_cluster_command_arguments}}
+                       {{/chip_cluster_command_arguments_with_structs_expanded}}
                        );
                    },
                    () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
@@ -276,11 +276,11 @@ public class ClusterInfoMapping {
                    (cluster, callback, commandArguments) -> {
                        ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
                           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
-                          {{#chip_cluster_command_arguments}}
+                          {{#chip_cluster_command_arguments_with_structs_expanded}}
                           ,
                              ({{asJavaBoxedType type}})
                            commandArguments.get("{{asLowerCamelCase label}}")
-                {{/chip_cluster_command_arguments}}
+                {{/chip_cluster_command_arguments_with_structs_expanded}}
                 );
                    },
                    () -> new DelegatedDefaultClusterCallback(),
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 554b04ee8beba8..6df0cb9f27d6d7 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -3765,6 +3765,7 @@ public void reportCurrentLevelAttribute(IntegerAttributeCallback callback) {
       reportCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void readRemainingTimeAttribute(
       IntegerAttributeCallback callback
@@ -3774,6 +3775,8 @@ public void readRemainingTimeAttribute(
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+>>>>>>> f00108887 (merge conflict)
     public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
 >>>>>>> e993d01f0 (callback generation done)
       readRemainingTimeAttribute(chipClusterPtr, callback);
@@ -3879,6 +3882,7 @@ public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, i
       writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value);
     }
 
+<<<<<<< HEAD
     public void readClusterRevisionAttribute(
       IntegerAttributeCallback callback
     ) {
@@ -3897,12 +3901,16 @@ >>>>>>> d51f00a65 (need to wait for cast-helper)
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
 >>>>>>> 6e6e45a1a (callback generation done)
 >>>>>>> e993d01f0 (callback generation done)
+=======
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+>>>>>>> f00108887 (merge conflict)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
     private native void readCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
@@ -3913,14 +3921,14 @@ private native void readCurrentLevelAttribute(
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 =======
 >>>>>>> 6e6e45a1a (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
     private native void subscribeCurrentLevelAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
     private native void reportCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     private native void readRemainingTimeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -3983,6 +3991,7 @@ private native void writeStartUpCurrentLevelAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> d51f00a65 (need to wait for cast-helper)
@@ -4073,6 +4082,8 @@ private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 >>>>>>> 6e6e45a1a (callback generation done)
 >>>>>>> e993d01f0 (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
   }
 
   public static class LowPowerCluster extends BaseChipCluster {
@@ -6479,12 +6490,15 @@ public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
     }
 =======
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+>>>>>>> c49afcc9f (merge conflict)
 
 =======
 <<<<<<< HEAD
@@ -6498,7 +6512,12 @@ >>>>>>> e83b94d19 (need to wait for cast-helper)
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> e993d01f0 (callback generation done)
+<<<<<<< HEAD
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+=======
+>>>>>>> f00108887 (merge conflict)
+>>>>>>> c49afcc9f (merge conflict)
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
@@ -6513,6 +6532,7 @@ public void testListStructArgumentRequest(DefaultClusterCallback callback, int a
       testListStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
 
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 =======
@@ -6520,6 +6540,8 @@ >>>>>>> d51f00a65 (need to wait for cast-helper)
 =======
 >>>>>>> 6e6e45a1a (callback generation done)
 >>>>>>> e993d01f0 (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
     public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
@@ -6539,6 +6561,7 @@ public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 
     public void testStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
@@ -6547,12 +6570,15 @@ public void testStructArgumentRequest(DefaultClusterCallback callback, int a, bo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+>>>>>>> f00108887 (merge conflict)
     public void testStructArgumentRequest(
         DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
 >>>>>>> e993d01f0 (callback generation done)
       testStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
 
+<<<<<<< HEAD
 
 <<<<<<< HEAD
 =======
@@ -6560,6 +6586,8 @@ >>>>>>> d51f00a65 (need to wait for cast-helper)
 =======
 >>>>>>> 6e6e45a1a (callback generation done)
 >>>>>>> e993d01f0 (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
     public void testUnknownCommand(DefaultClusterCallback callback) {
       testUnknownCommand(chipClusterPtr, callback);
     }
@@ -6569,6 +6597,7 @@ public void testUnknownCommand(DefaultClusterCallback callback) {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
@@ -6603,6 +6632,8 @@ private native void testListStructArgumentRequest(
 >>>>>>> e83b94d19 (need to wait for cast-helper)
 =======
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+>>>>>>> c49afcc9f (merge conflict)
     private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
     private native void testListInt8UArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int arg1);
     private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
@@ -6616,12 +6647,12 @@ >>>>>>> e83b94d19 (need to wait for cast-helper)
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 =======
 >>>>>>> 6e6e45a1a (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
 
     private native void testAddArguments(
         long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     private native void testListInt8UArgumentRequest(
         long chipClusterPtr, DefaultClusterCallback callback, int arg1);
 
@@ -6638,6 +6669,7 @@ private native void testListStructArgumentRequest(
         String e,
         int f);
 
+<<<<<<< HEAD
 =======
     private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
 >>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
@@ -6669,6 +6701,11 @@ >>>>>>> e83b94d19 (need to wait for cast-helper)
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+    private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
+
+    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
+>>>>>>> f00108887 (merge conflict)
 
     private native void testStructArgumentRequest(
         long chipClusterPtr,
@@ -6680,6 +6717,7 @@ private native void testStructArgumentRequest(
         String e,
         int f);
 
+<<<<<<< HEAD
 =======
 >>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
 =======
@@ -6691,6 +6729,8 @@ >>>>>>> d51f00a65 (need to wait for cast-helper)
 
 >>>>>>> 6e6e45a1a (callback generation done)
 >>>>>>> e993d01f0 (callback generation done)
+=======
+>>>>>>> f00108887 (merge conflict)
     private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
 
     public interface TestAddArgumentsResponseCallback {
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 0cdb705cf34737..479104c0fcad97 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -17964,6 +17964,81 @@ public Map<String, ClusterInfo> getClusterMap() {
             () -> new DelegatedTestAddArgumentsResponseCallback(),
             testClustertestAddArgumentsCommandParams);
     testClusterClusterCommandInfo.put("testAddArguments", testClustertestAddArgumentsCommandInfo);
+    Map<String, CommandParameter> testClustertestListInt8UArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testClustertestListInt8UArgumentRequestCommandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter testClustertestListInt8UArgumentRequestarg1CommandParameter =
+        new CommandParameter("arg1", int.class);
+    testClustertestListInt8UArgumentRequestCommandParams.put(
+        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameter);
+
+    // Populate commands
+    CommandInfo testClustertestListInt8UArgumentRequestCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListInt8UArgumentRequest(
+                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("arg1"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testClustertestListInt8UArgumentRequestCommandParams);
+    testClusterClusterCommandInfo.put(
+        "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
+    Map<String, CommandParameter> testClustertestListStructArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testClustertestListStructArgumentRequestCommandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter testClustertestListStructArgumentRequestaCommandParameter =
+        new CommandParameter("a", int.class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "a", testClustertestListStructArgumentRequestaCommandParameter);
+
+    CommandParameter testClustertestListStructArgumentRequestbCommandParameter =
+        new CommandParameter("b", boolean.class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "b", testClustertestListStructArgumentRequestbCommandParameter);
+
+    CommandParameter testClustertestListStructArgumentRequestcCommandParameter =
+        new CommandParameter("c", int.class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "c", testClustertestListStructArgumentRequestcCommandParameter);
+
+    CommandParameter testClustertestListStructArgumentRequestdCommandParameter =
+        new CommandParameter("d", byte[].class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "d", testClustertestListStructArgumentRequestdCommandParameter);
+
+    CommandParameter testClustertestListStructArgumentRequesteCommandParameter =
+        new CommandParameter("e", String.class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "e", testClustertestListStructArgumentRequesteCommandParameter);
+
+    CommandParameter testClustertestListStructArgumentRequestfCommandParameter =
+        new CommandParameter("f", int.class);
+    testClustertestListStructArgumentRequestCommandParams.put(
+        "f", testClustertestListStructArgumentRequestfCommandParameter);
+
+    // Populate commands
+    CommandInfo testClustertestListStructArgumentRequestCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListStructArgumentRequest(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("a"),
+                      (Boolean) commandArguments.get("b"),
+                      (Integer) commandArguments.get("c"),
+                      (byte[]) commandArguments.get("d"),
+                      (String) commandArguments.get("e"),
+                      (Integer) commandArguments.get("f"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testClustertestListStructArgumentRequestCommandParams);
+    testClusterClusterCommandInfo.put(
+        "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
     Map<String, CommandParameter> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -18031,6 +18106,59 @@ public Map<String, ClusterInfo> getClusterMap() {
             () -> new DelegatedTestSpecificResponseCallback(),
             testClustertestSpecificCommandParams);
     testClusterClusterCommandInfo.put("testSpecific", testClustertestSpecificCommandInfo);
+    Map<String, CommandParameter> testClustertestStructArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameter>();
+    // TODO: fill out parameter types
+    CommandParameter testClustertestStructArgumentRequestCommandParameter =
+        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameter testClustertestStructArgumentRequestaCommandParameter =
+        new CommandParameter("a", int.class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "a", testClustertestStructArgumentRequestaCommandParameter);
+
+    CommandParameter testClustertestStructArgumentRequestbCommandParameter =
+        new CommandParameter("b", boolean.class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "b", testClustertestStructArgumentRequestbCommandParameter);
+
+    CommandParameter testClustertestStructArgumentRequestcCommandParameter =
+        new CommandParameter("c", int.class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "c", testClustertestStructArgumentRequestcCommandParameter);
+
+    CommandParameter testClustertestStructArgumentRequestdCommandParameter =
+        new CommandParameter("d", byte[].class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "d", testClustertestStructArgumentRequestdCommandParameter);
+
+    CommandParameter testClustertestStructArgumentRequesteCommandParameter =
+        new CommandParameter("e", String.class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "e", testClustertestStructArgumentRequesteCommandParameter);
+
+    CommandParameter testClustertestStructArgumentRequestfCommandParameter =
+        new CommandParameter("f", int.class);
+    testClustertestStructArgumentRequestCommandParams.put(
+        "f", testClustertestStructArgumentRequestfCommandParameter);
+
+    // Populate commands
+    CommandInfo testClustertestStructArgumentRequestCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testStructArgumentRequest(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("a"),
+                      (Boolean) commandArguments.get("b"),
+                      (Integer) commandArguments.get("c"),
+                      (byte[]) commandArguments.get("d"),
+                      (String) commandArguments.get("e"),
+                      (Integer) commandArguments.get("f"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            testClustertestStructArgumentRequestCommandParams);
+    testClusterClusterCommandInfo.put(
+        "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
     Map<String, CommandParameter> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)

From 433e6227d154fadf823accfd6dd8eb7436fbd670 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Tue, 19 Oct 2021 15:16:41 -0400
Subject: [PATCH 17/38] fix comments

---
 .../.idea/deploymentTargetDropDown.xml        |   17 -
 .../ClusterInteractionFragment.kt             |   36 +-
 src/controller/java/BUILD.gn                  |   17 +
 .../src/chip/clusterinfo/CommandInfo.java     |    8 +-
 .../chip/clusterinfo/CommandParameter.java    |   13 -
 .../clusterinfo/CommandParameterInfo.java     |    3 +
 .../src/chip/clusterinfo/ParameterType.java   |    9 -
 .../java/templates/ClusterInfo-java.zapt      |   73 +-
 src/controller/java/templates/templates.json  |    3 +
 .../devicecontroller/ClusterInfoMapping.java  | 3997 ++++++++++++-----
 10 files changed, 3010 insertions(+), 1166 deletions(-)
 delete mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
 delete mode 100644 src/controller/java/src/chip/clusterinfo/CommandParameter.java
 delete mode 100644 src/controller/java/src/chip/clusterinfo/ParameterType.java

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 8631f9e2976c8d..00000000000000
--- a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="12171FDD4002GB" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-10-18T22:29:04.867972Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index f27ba82ede1002..abba4faf5c447d 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -31,7 +31,6 @@ import
 =======
 import chip.devicecontroller.ClusterInfoMapping
 import java.lang.Exception
-import java.util.Objects
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 >>>>>>> a4fd0282e (no error code generation)
@@ -61,6 +60,7 @@ class ClusterInteractionFragment : Fragment() {
       addressUpdateFragment =
         childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       clusterMap = ClusterInfoMapping().clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
@@ -115,45 +115,41 @@ class ClusterInteractionFragment : Fragment() {
       val clusterMapping = ClusterInfoMapping()
       clusterMap = clusterMapping.clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch {getClusterMapping()} }
+=======
+      clusterMap = ClusterInfoMapping().clusterMap;
+      getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
+>>>>>>> fde1d13c0 (fix comments)
     }
   }
 
   private suspend fun getClusterMapping() {
-    // In real code: get the device ptr using ChipClient.getConnectedDevicePointer
-    showMessage("initialized")
     // In real code: "OnOff" would be selected by the user.
-    val selectedClusterInfo = clusterMap["onOff"]
+    val methodSelected = "onOff"
+    showMessage(methodSelected + " is initialized")
+    val selectedClusterInfo = clusterMap[methodSelected]!!
     val devicePtr =
       ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
     val endpointId = 1
-    val selectedCluster = selectedClusterInfo!!.createClusterFunction.create(devicePtr, endpointId)
+    val selectedCluster = selectedClusterInfo.createClusterFunction.create(devicePtr, endpointId)
     // Imagine user wants to execute the command "OffWithEffect", pass the string here
-    val selectedCommandInfo: CommandInfo? = selectedClusterInfo!!.commands["on"]
+    val selectedCommandInfo: CommandInfo = selectedClusterInfo.commands["on"]!!
 
-    var selectedCommandCallback =  selectedCommandInfo?.commandCallbackSupplier?.get()
+    var selectedCommandCallback =  selectedCommandInfo.commandCallbackSupplier.get()
     selectedCommandCallback?.setCallbackDelegate(object : ClusterCommandCallback {
-      override fun onSuccess(responseValues: List<Any?>?) {
-        showMessage("command success")
+      override fun onSuccess(responseValues: List<Any>) {
+        showMessage("Command success")
         // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
-        for (responseValue in responseValues!!) {
-           Log.d("test", responseValue.toString());
-        }
-
+        responseValues.forEach { Log.d(TAG, it.toString()) }
       }
 
       override fun onFailure(exception: Exception?) {
-        showMessage("command failed")
-        Log.e(ClusterInteractionFragment.TAG, exception.toString())
-
+        showMessage("Command failed")
+        Log.e(TAG, exception.toString())
       }
     })
 
     var commandArguments: HashMap<String, Any> = HashMap<String, Any>()
-    for ((key, value) in selectedCommandInfo!!.commandParameters.entries) {
-      commandArguments.put(key, 123)
-    }
     selectedCommandInfo.getCommandFunction().invokeCommand(selectedCluster, selectedCommandCallback, commandArguments)
-
   }
 
   private fun showMessage(msg: String) {
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 6a9e6545f7e6e5..ff108374892205 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -58,6 +58,7 @@ android_library("java") {
   ]
 
   sources = [
+<<<<<<< HEAD
     "src/chip/clusterinfo/ClusterCommandCallback.java",
     "src/chip/clusterinfo/ClusterInfo.java",
     "src/chip/clusterinfo/CommandInfo.java",
@@ -69,6 +70,8 @@ android_library("java") {
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
     "src/chip/clusterinfo/ParameterType.java",
 >>>>>>> 9199ce0a6 (Restyled by gn)
+=======
+>>>>>>> fde1d13c0 (fix comments)
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",
     "src/chip/devicecontroller/ChipDeviceController.java",
@@ -77,6 +80,7 @@ android_library("java") {
     "src/chip/devicecontroller/PaseVerifierParams.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
 =======
@@ -85,6 +89,8 @@ android_library("java") {
 =======
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
 >>>>>>> a4fd0282e (no error code generation)
+=======
+>>>>>>> fde1d13c0 (fix comments)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
@@ -93,6 +99,17 @@ android_library("java") {
   #  ..../platforms/android-21/android.jar to access BLE items)
 }
 
+java_library("cluster_info") {
+  sources = [
+    "src/chip/clusterinfo/ClusterCommandCallback.java",
+    "src/chip/clusterinfo/ClusterInfo.java",
+    "src/chip/clusterinfo/CommandInfo.java",
+    "src/chip/clusterinfo/CommandParameterInfo.java",
+    "src/chip/clusterinfo/DelegatedClusterCallback.java",
+    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
+    ]
+}
+
 java_prebuilt("android") {
   jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
 }
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index f6a12248582f08..12a1f6882d020f 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -77,7 +77,7 @@ >>>>>>> a4fd0282e (no error code generation)
 public class CommandInfo {
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
-  private Map<String, CommandParameter> commandParameters;
+  private Map<String, CommandParameterInfo> commandParameters;
 
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -100,8 +100,12 @@ public CommandInfo(ClusterCommandFunction commandFunction,
   public CommandInfo(
       ClusterCommandFunction commandFunction,
       Supplier<DelegatedClusterCallback> commandCallbackSupplier,
+<<<<<<< HEAD
       Map<String, CommandParameter> commandParameters) {
 >>>>>>> 46c963914 (Restyled by google-java-format)
+=======
+      Map<String, CommandParameterInfo> commandParameters) {
+>>>>>>> fde1d13c0 (fix comments)
     this.commandFunction = commandFunction;
     this.commandCallbackSupplier = commandCallbackSupplier;
     this.commandParameters = commandParameters;
@@ -115,7 +119,7 @@ public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
     return commandCallbackSupplier;
   }
 
-  public Map<String, CommandParameter> getCommandParameters() {
+  public Map<String, CommandParameterInfo> getCommandParameters() {
     return commandParameters;
   }
 
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameter.java b/src/controller/java/src/chip/clusterinfo/CommandParameter.java
deleted file mode 100644
index 8b9bbd83ef9401..00000000000000
--- a/src/controller/java/src/chip/clusterinfo/CommandParameter.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package chip.clusterinfo;
-
-public class CommandParameter {
-  public CommandParameter() {}
-
-  public CommandParameter(String name, Class<?> type) {
-    this.name = name;
-    this.type = type;
-  }
-
-  public String name;
-  public Class<?> type;
-}
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index f54987408f507b..a951da990fb30d 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -1,6 +1,9 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
+=======
+>>>>>>> fde1d13c0 (fix comments)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
diff --git a/src/controller/java/src/chip/clusterinfo/ParameterType.java b/src/controller/java/src/chip/clusterinfo/ParameterType.java
deleted file mode 100644
index 10158f9ea7fd40..00000000000000
--- a/src/controller/java/src/chip/clusterinfo/ParameterType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package chip.clusterinfo;
-
-enum ParameterType {
-  CALLBACK,
-  INT,
-  LONG,
-  BOOLEAN,
-  STRUCT
-}
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 4420293af070e2..b9d6469a72365b 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -155,7 +155,7 @@ import java.util.List;
 import java.util.*;
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
-import chip.clusterinfo.CommandParameter;
+import chip.clusterinfo.CommandParameterInfo;
 import chip.clusterinfo.ParameterType;
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.clusterinfo.ClusterCommandCallback;
@@ -186,7 +186,7 @@ public class ClusterInfoMapping {
     }
   }
   {{#chip_client_clusters}}
-    {{#chip_cluster_responses}}
+  {{#chip_cluster_responses}}
       public class Delegated{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
         private ClusterCommandCallback callback;
 
@@ -194,31 +194,32 @@ public class ClusterInfoMapping {
         public void setCallbackDelegate(ClusterCommandCallback callback) {
           this.callback = callback;
         }
+
         @Override
         public void onSuccess(
-              {{#chip_cluster_response_arguments}}
-              {{#if isArray}}
-                  // {{asSymbol label}}: {{asUnderlyingZclType type}}
-                  // Conversion from this type to Java is not properly implemented yet
-              {{else if (isOctetString type)}}
-                  {{omitCommaForFirstNonStatusCommand parent.id index}}byte[] {{asSymbol label}}
-              {{else if (isShortString type)}}
-                  {{omitCommaForFirstNonStatusCommand parent.id index}}String {{asSymbol label}}
-              {{else}}
-                  {{omitCommaForFirstNonStatusCommand parent.id index}}{{asJavaBasicTypeForZclType type false}} {{asSymbol label}}
-              {{/if}}
-              {{/chip_cluster_response_arguments}}
+        {{#chip_cluster_response_arguments}}
+        {{#if isArray}}
+           // {{asSymbol label}}: {{asUnderlyingZclType type}}
+           // Conversion from this type to Java is not properly implemented yet
+           {{else if (isOctetString type)}}
+              {{omitCommaForFirstNonStatusCommand parent.id index}}byte[] {{asSymbol label}}
+           {{else if (isShortString type)}}
+              {{omitCommaForFirstNonStatusCommand parent.id index}}String {{asSymbol label}}
+           {{else}}
+              {{omitCommaForFirstNonStatusCommand parent.id index}}{{asJavaBasicTypeForZclType type false}} {{asSymbol label}}
+           {{/if}}
+        {{/chip_cluster_response_arguments}}
         ) {
-            List<Object> responseValues = new ArrayList<>();
-            {{#chip_cluster_response_arguments}}
-              {{#if isArray}}
-                // {{asSymbol label}}: {{asUnderlyingZclType type}}
-                // Conversion from this type to Java is not properly implemented yet
-              {{else}}
-              responseValues.add({{asSymbol label}});
-              {{/if}}
-            {{/chip_cluster_response_arguments}}
-            callback.onSuccess(responseValues);
+           List<Object> responseValues = new ArrayList<>();
+           {{#chip_cluster_response_arguments}}
+             {{#if isArray}}
+               // {{asSymbol label}}: {{asUnderlyingZclType type}}
+               // Conversion from this type to Java is not properly implemented yet
+             {{else}}
+           responseValues.add({{asSymbol label}});
+             {{/if}}
+           {{/chip_cluster_response_arguments}}
+           callback.onSuccess(responseValues);
         }
 
         @Override
@@ -227,32 +228,32 @@ public class ClusterInfoMapping {
         }
       }
 
-    {{/chip_cluster_responses}}
- {{/chip_client_clusters}}
+  {{/chip_cluster_responses}}
+  {{/chip_client_clusters}}
 
  public Map<String, ClusterInfo> getClusterMap() {
      Map<String, ClusterInfo> clusterMap = new HashMap<>();
      {{#chip_client_clusters}}
-     Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfo = new LinkedHashMap<>();
+     Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfoMap = new LinkedHashMap<>();
      {{#chip_cluster_commands}}
-           Map<String, CommandParameter> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameter>();
+           Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
            // TODO: fill out parameter types
            {{#if (zcl_command_arguments_count this.id)}}
                {{#if hasSpecificResponse}}
-                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
                {{else}}
-                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
                {{#chip_cluster_command_arguments_with_structs_expanded}}
-                 CommandParameter {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter = new CommandParameter("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameter);
+                 CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+                 {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
                  {{#not_last}} {{/not_last}}
                {{/chip_cluster_command_arguments_with_structs_expanded}}
            {{else}}
                {{#if hasSpecificResponse}}
-                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
                {{else}}
-                 CommandParameter {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameter = new CommandParameter("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
                {{/if}}
            {{/if}}
            // Populate commands
@@ -287,11 +288,11 @@ public class ClusterInfoMapping {
                    {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
            );
            {{/if}}
-           {{asLowerCamelCase ../name}}ClusterCommandInfo.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
+           {{asLowerCamelCase ../name}}ClusterCommandInfoMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
      {{/chip_cluster_commands}}
      // Populate cluster
      ClusterInfo {{asLowerCamelCase name}}ClusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfo);
+          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfoMap);
      clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
      {{/chip_client_clusters}}
 <<<<<<< HEAD
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index 2cd0f16bf7adbe..a285dc77e107eb 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -39,6 +39,9 @@
         {
             "path": "ClusterInfo-java.zapt",
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> fde1d13c0 (fix comments)
             "name": "Cluster information mapping for Java",
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
 =======
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 479104c0fcad97..ce06a52c645e28 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -7505,7 +7505,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
-import chip.clusterinfo.CommandParameter;
+import chip.clusterinfo.CommandParameterInfo;
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 import java.util.*;
@@ -9298,13 +9298,14 @@ public void onError(Exception error) {
 
   public Map<String, ClusterInfo> getClusterMap() {
     Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    Map<String, CommandInfo> accountLoginClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> accountLogingetSetupPINCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
+    Map<String, CommandInfo> accountLoginClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter accountLogingetSetupPINCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo accountLogingetSetupPINCommandParameterInfo =
+        new CommandParameterInfo(
             "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter accountLogingetSetupPINtempAccountIdentifierCommandParameter =
         new CommandParameter("tempAccountIdentifier", String.class);
 <<<<<<< HEAD
@@ -9315,6 +9316,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     accountLogingetSetupPINCommandParams.put(
         "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
+        new CommandParameterInfo("tempAccountIdentifier", String.class);
+    accountLogingetSetupPINCommandParams.put(
+        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo accountLogingetSetupPINCommandInfo =
@@ -9350,18 +9357,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetSetupPINResponseCallback(),
             accountLogingetSetupPINCommandParams);
+<<<<<<< HEAD
     accountLoginClusterCommandInfo.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
     Map<String, CommandParameter> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    accountLoginClusterCommandInfoMap.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
+    Map<String, CommandParameterInfo> accountLoginloginCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter accountLoginloginCommandParameter =
-        new CommandParameter("AccountLogin", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter accountLoginlogintempAccountIdentifierCommandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
+    CommandParameterInfo accountLoginloginCommandParameterInfo =
+        new CommandParameterInfo("AccountLogin", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
+        new CommandParameterInfo("tempAccountIdentifier", String.class);
     accountLoginloginCommandParams.put(
-        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameter);
+        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter accountLoginloginsetupPINCommandParameter =
         new CommandParameter("setupPIN", String.class);
 <<<<<<< HEAD
@@ -9370,6 +9384,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
+        new CommandParameterInfo("setupPIN", String.class);
+    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo accountLoginloginCommandInfo =
@@ -9387,11 +9406,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             accountLoginloginCommandParams);
-    accountLoginClusterCommandInfo.put("login", accountLoginloginCommandInfo);
+    accountLoginClusterCommandInfoMap.put("login", accountLoginloginCommandInfo);
     // Populate cluster
     ClusterInfo accountLoginClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             accountLogin_ClusterCommandInfo);
     clusterMap.put("accountLogin", accountLogin_clusterInfo);
@@ -9412,23 +9432,35 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> administratorCommissioningClusterCommandInfo = new LinkedHashMap<>();
 >>>>>>> 41b0956c1 (on/off commands working)
     Map<String, CommandParameter>
+=======
+            accountLoginClusterCommandInfoMap);
+    clusterMap.put("accountLogin", accountLoginClusterInfo);
+    Map<String, CommandInfo> administratorCommissioningClusterCommandInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo>
+>>>>>>> fde1d13c0 (fix comments)
         administratorCommissioningopenBasicCommissioningWindowCommandParams =
-            new LinkedHashMap<String, CommandParameter>();
+            new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioningopenBasicCommissioningWindowCommandParameter =
-        new CommandParameter(
-            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameter =
-            new CommandParameter("commissioningTimeout", int.class);
+    CommandParameterInfo
+        administratorCommissioningopenBasicCommissioningWindowCommandParameterInfo =
+            new CommandParameterInfo(
+                "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
+            new CommandParameterInfo("commissioningTimeout", int.class);
     administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
         "commissioningTimeout",
+<<<<<<< HEAD
 <<<<<<< HEAD
         administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo administratorCommissioningopenBasicCommissioningWindowCommandInfo =
@@ -9445,7 +9477,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             administratorCommissioningopenBasicCommissioningWindowCommandParams);
-    administratorCommissioningClusterCommandInfo.put(
+    administratorCommissioningClusterCommandInfoMap.put(
         "openBasicCommissioningWindow",
 <<<<<<< HEAD
         administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
@@ -9488,43 +9520,53 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
         administratorCommissioningopenBasicCommissioningWindowCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> administratorCommissioningopenCommissioningWindowCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo>
+        administratorCommissioningopenCommissioningWindowCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioningopenCommissioningWindowCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowCommandParameterInfo =
+        new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameter =
-            new CommandParameter("commissioningTimeout", int.class);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
+            new CommandParameterInfo("commissioningTimeout", int.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "commissioningTimeout",
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameter);
+        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
 
-    CommandParameter administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameter =
-        new CommandParameter("PAKEVerifier", byte[].class);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
+            new CommandParameterInfo("PAKEVerifier", byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "PAKEVerifier",
-        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameter);
+        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
 
-    CommandParameter
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameter =
-            new CommandParameter("discriminator", int.class);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
+            new CommandParameterInfo("discriminator", int.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "discriminator",
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameter);
+        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
 
-    CommandParameter administratorCommissioningopenCommissioningWindowiterationsCommandParameter =
-        new CommandParameter("iterations", long.class);
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
+            new CommandParameterInfo("iterations", long.class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "iterations", administratorCommissioningopenCommissioningWindowiterationsCommandParameter);
+        "iterations",
+        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
 
-    CommandParameter administratorCommissioningopenCommissioningWindowsaltCommandParameter =
-        new CommandParameter("salt", byte[].class);
+    CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
+        new CommandParameterInfo("salt", byte[].class);
     administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameter);
+        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     CommandParameter
         administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter =
@@ -9539,6 +9581,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     administratorCommissioningopenCommissioningWindowCommandParams.put(
         "passcodeID", administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo
+        administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameterInfo =
+            new CommandParameterInfo("passcodeID", int.class);
+    administratorCommissioningopenCommissioningWindowCommandParams.put(
+        "passcodeID",
+        administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo administratorCommissioningopenCommissioningWindowCommandInfo =
@@ -9573,14 +9623,19 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             administratorCommissioningopenCommissioningWindowCommandParams);
-    administratorCommissioningClusterCommandInfo.put(
+    administratorCommissioningClusterCommandInfoMap.put(
         "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> administratorCommissioningrevokeCommissioningCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter administratorCommissioningrevokeCommissioningCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo administratorCommissioningrevokeCommissioningCommandParameterInfo =
+        new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -9596,13 +9651,14 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             administratorCommissioningrevokeCommissioningCommandParams);
-    administratorCommissioningClusterCommandInfo.put(
+    administratorCommissioningClusterCommandInfoMap.put(
         "revokeCommissioning", administratorCommissioningrevokeCommissioningCommandInfo);
     // Populate cluster
     ClusterInfo administratorCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             administratorCommissioning_ClusterCommandInfo);
     clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
@@ -9637,6 +9693,20 @@ public Map<String, ClusterInfo> getClusterMap() {
     applicationBasicchangeStatusCommandParams.put(
         "status", applicationBasicchangeStatusstatusCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            administratorCommissioningClusterCommandInfoMap);
+    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
+    Map<String, CommandInfo> applicationBasicClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> applicationBasicchangeStatusCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo applicationBasicchangeStatusCommandParameterInfo =
+        new CommandParameterInfo("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo =
+        new CommandParameterInfo("status", int.class);
+    applicationBasicchangeStatusCommandParams.put(
+        "status", applicationBasicchangeStatusstatusCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo applicationBasicchangeStatusCommandInfo =
@@ -9652,11 +9722,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             applicationBasicchangeStatusCommandParams);
-    applicationBasicClusterCommandInfo.put("changeStatus", applicationBasicchangeStatusCommandInfo);
+    applicationBasicClusterCommandInfoMap.put(
+        "changeStatus", applicationBasicchangeStatusCommandInfo);
     // Populate cluster
     ClusterInfo applicationBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             applicationBasic_ClusterCommandInfo);
     clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
@@ -9685,21 +9757,29 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            applicationBasicClusterCommandInfoMap);
+    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
+    Map<String, CommandInfo> applicationLauncherClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter applicationLauncherlaunchAppCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo applicationLauncherlaunchAppCommandParameterInfo =
+        new CommandParameterInfo(
             "ApplicationLauncher",
             ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
-    CommandParameter applicationLauncherlaunchAppdataCommandParameter =
-        new CommandParameter("data", String.class);
+    CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
+        new CommandParameterInfo("data", String.class);
     applicationLauncherlaunchAppCommandParams.put(
-        "data", applicationLauncherlaunchAppdataCommandParameter);
+        "data", applicationLauncherlaunchAppdataCommandParameterInfo);
 
-    CommandParameter applicationLauncherlaunchAppcatalogVendorIdCommandParameter =
-        new CommandParameter("catalogVendorId", int.class);
+    CommandParameterInfo applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo =
+        new CommandParameterInfo("catalogVendorId", int.class);
     applicationLauncherlaunchAppCommandParams.put(
-        "catalogVendorId", applicationLauncherlaunchAppcatalogVendorIdCommandParameter);
+        "catalogVendorId", applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter applicationLauncherlaunchAppapplicationIdCommandParameter =
         new CommandParameter("applicationId", String.class);
 <<<<<<< HEAD
@@ -9710,6 +9790,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     applicationLauncherlaunchAppCommandParams.put(
         "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo applicationLauncherlaunchAppapplicationIdCommandParameterInfo =
+        new CommandParameterInfo("applicationId", String.class);
+    applicationLauncherlaunchAppCommandParams.put(
+        "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo applicationLauncherlaunchAppCommandInfo =
@@ -9728,11 +9814,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedLaunchAppResponseCallback(),
             applicationLauncherlaunchAppCommandParams);
-    applicationLauncherClusterCommandInfo.put("launchApp", applicationLauncherlaunchAppCommandInfo);
+    applicationLauncherClusterCommandInfoMap.put(
+        "launchApp", applicationLauncherlaunchAppCommandInfo);
     // Populate cluster
     ClusterInfo applicationLauncherClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             applicationLauncher_ClusterCommandInfo);
     clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
@@ -9757,13 +9845,22 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            applicationLauncherClusterCommandInfoMap);
+    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
+    Map<String, CommandInfo> audioOutputClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter audioOutputrenameOutputCommandParameter =
-        new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter audioOutputrenameOutputindexCommandParameter =
-        new CommandParameter("index", int.class);
-    audioOutputrenameOutputCommandParams.put("index", audioOutputrenameOutputindexCommandParameter);
+    CommandParameterInfo audioOutputrenameOutputCommandParameterInfo =
+        new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
+        new CommandParameterInfo("index", int.class);
+    audioOutputrenameOutputCommandParams.put(
+        "index", audioOutputrenameOutputindexCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter audioOutputrenameOutputnameCommandParameter =
         new CommandParameter("name", String.class);
 <<<<<<< HEAD
@@ -9773,6 +9870,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     audioOutputrenameOutputCommandParams.put("name", audioOutputrenameOutputnameCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
+        new CommandParameterInfo("name", String.class);
+    audioOutputrenameOutputCommandParams.put(
+        "name", audioOutputrenameOutputnameCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo audioOutputrenameOutputCommandInfo =
@@ -9803,6 +9906,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             audioOutputrenameOutputCommandParams);
+<<<<<<< HEAD
     audioOutputClusterCommandInfo.put("renameOutput", audioOutputrenameOutputCommandInfo);
     Map<String, CommandParameter> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -9819,6 +9923,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     audioOutputselectOutputCommandParams.put("index", audioOutputselectOutputindexCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    audioOutputClusterCommandInfoMap.put("renameOutput", audioOutputrenameOutputCommandInfo);
+    Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo audioOutputselectOutputCommandParameterInfo =
+        new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
+        new CommandParameterInfo("index", int.class);
+    audioOutputselectOutputCommandParams.put(
+        "index", audioOutputselectOutputindexCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo audioOutputselectOutputCommandInfo =
@@ -9834,11 +9950,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             audioOutputselectOutputCommandParams);
-    audioOutputClusterCommandInfo.put("selectOutput", audioOutputselectOutputCommandInfo);
+    audioOutputClusterCommandInfoMap.put("selectOutput", audioOutputselectOutputCommandInfo);
     // Populate cluster
     ClusterInfo audioOutputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             audioOutput_ClusterCommandInfo);
     clusterMap.put("audioOutput", audioOutput_clusterInfo);
@@ -9875,6 +9992,20 @@ public Map<String, ClusterInfo> getClusterMap() {
     barrierControlbarrierControlGoToPercentCommandParams.put(
         "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            audioOutputClusterCommandInfoMap);
+    clusterMap.put("audioOutput", audioOutputClusterInfo);
+    Map<String, CommandInfo> barrierControlClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo barrierControlbarrierControlGoToPercentCommandParameterInfo =
+        new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
+        new CommandParameterInfo("percentOpen", int.class);
+    barrierControlbarrierControlGoToPercentCommandParams.put(
+        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo barrierControlbarrierControlGoToPercentCommandInfo =
@@ -9903,8 +10034,9 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             barrierControlbarrierControlGoToPercentCommandParams);
-    barrierControlClusterCommandInfo.put(
+    barrierControlClusterCommandInfoMap.put(
         "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> barrierControlbarrierControlStopCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -9912,6 +10044,13 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter barrierControlbarrierControlStopCommandParameter =
         new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo barrierControlbarrierControlStopCommandParameterInfo =
+        new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo barrierControlbarrierControlStopCommandInfo =
         new CommandInfo(
@@ -9925,12 +10064,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             barrierControlbarrierControlStopCommandParams);
-    barrierControlClusterCommandInfo.put(
+    barrierControlClusterCommandInfoMap.put(
         "barrierControlStop", barrierControlbarrierControlStopCommandInfo);
     // Populate cluster
     ClusterInfo barrierControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             barrierControl_ClusterCommandInfo);
     clusterMap.put("barrierControl", barrierControl_clusterInfo);
@@ -9953,6 +10093,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter basicmfgSpecificPingCommandParameter =
         new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            barrierControlClusterCommandInfoMap);
+    clusterMap.put("barrierControl", barrierControlClusterInfo);
+    Map<String, CommandInfo> basicClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> basicmfgSpecificPingCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo basicmfgSpecificPingCommandParameterInfo =
+        new CommandParameterInfo("Basic", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo basicmfgSpecificPingCommandInfo =
         new CommandInfo(
@@ -9966,18 +10116,19 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             basicmfgSpecificPingCommandParams);
-    basicClusterCommandInfo.put("mfgSpecificPing", basicmfgSpecificPingCommandInfo);
+    basicClusterCommandInfoMap.put("mfgSpecificPing", basicmfgSpecificPingCommandInfo);
     // Populate cluster
     ClusterInfo basicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId),
-            basicClusterCommandInfo);
+            basicClusterCommandInfoMap);
     clusterMap.put("basic", basicClusterInfo);
-    Map<String, CommandInfo> binaryInputBasicClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> binaryInputBasicClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo binaryInputBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             binaryInputBasic_ClusterCommandInfo);
     clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
@@ -10009,20 +10160,29 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> bindingbindCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            binaryInputBasicClusterCommandInfoMap);
+    clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
+    Map<String, CommandInfo> bindingClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> bindingbindCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter bindingbindCommandParameter =
-        new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter bindingbindnodeIdCommandParameter = new CommandParameter("nodeId", long.class);
-    bindingbindCommandParams.put("nodeId", bindingbindnodeIdCommandParameter);
+    CommandParameterInfo bindingbindCommandParameterInfo =
+        new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bindingbindnodeIdCommandParameterInfo =
+        new CommandParameterInfo("nodeId", long.class);
+    bindingbindCommandParams.put("nodeId", bindingbindnodeIdCommandParameterInfo);
 
-    CommandParameter bindingbindgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    bindingbindCommandParams.put("groupId", bindingbindgroupIdCommandParameter);
+    CommandParameterInfo bindingbindgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    bindingbindCommandParams.put("groupId", bindingbindgroupIdCommandParameterInfo);
 
-    CommandParameter bindingbindendpointIdCommandParameter =
-        new CommandParameter("endpointId", int.class);
-    bindingbindCommandParams.put("endpointId", bindingbindendpointIdCommandParameter);
+    CommandParameterInfo bindingbindendpointIdCommandParameterInfo =
+        new CommandParameterInfo("endpointId", int.class);
+    bindingbindCommandParams.put("endpointId", bindingbindendpointIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter bindingbindclusterIdCommandParameter =
         new CommandParameter("clusterId", long.class);
 <<<<<<< HEAD
@@ -10031,6 +10191,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     bindingbindCommandParams.put("clusterId", bindingbindclusterIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo bindingbindclusterIdCommandParameterInfo =
+        new CommandParameterInfo("clusterId", long.class);
+    bindingbindCommandParams.put("clusterId", bindingbindclusterIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo bindingbindCommandInfo =
@@ -10074,25 +10239,32 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             bindingbindCommandParams);
+<<<<<<< HEAD
     bindingClusterCommandInfo.put("bind", bindingbindCommandInfo);
     Map<String, CommandParameter> bindingunbindCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    bindingClusterCommandInfoMap.put("bind", bindingbindCommandInfo);
+    Map<String, CommandParameterInfo> bindingunbindCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter bindingunbindCommandParameter =
-        new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter bindingunbindnodeIdCommandParameter =
-        new CommandParameter("nodeId", long.class);
-    bindingunbindCommandParams.put("nodeId", bindingunbindnodeIdCommandParameter);
+    CommandParameterInfo bindingunbindCommandParameterInfo =
+        new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bindingunbindnodeIdCommandParameterInfo =
+        new CommandParameterInfo("nodeId", long.class);
+    bindingunbindCommandParams.put("nodeId", bindingunbindnodeIdCommandParameterInfo);
 
-    CommandParameter bindingunbindgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    bindingunbindCommandParams.put("groupId", bindingunbindgroupIdCommandParameter);
+    CommandParameterInfo bindingunbindgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    bindingunbindCommandParams.put("groupId", bindingunbindgroupIdCommandParameterInfo);
 
-    CommandParameter bindingunbindendpointIdCommandParameter =
-        new CommandParameter("endpointId", int.class);
-    bindingunbindCommandParams.put("endpointId", bindingunbindendpointIdCommandParameter);
+    CommandParameterInfo bindingunbindendpointIdCommandParameterInfo =
+        new CommandParameterInfo("endpointId", int.class);
+    bindingunbindCommandParams.put("endpointId", bindingunbindendpointIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter bindingunbindclusterIdCommandParameter =
         new CommandParameter("clusterId", long.class);
 <<<<<<< HEAD
@@ -10101,8 +10273,13 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     bindingunbindCommandParams.put("clusterId", bindingunbindclusterIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
-
-    // Populate commands
+=======
+    CommandParameterInfo bindingunbindclusterIdCommandParameterInfo =
+        new CommandParameterInfo("clusterId", long.class);
+    bindingunbindCommandParams.put("clusterId", bindingunbindclusterIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
+
+    // Populate commands
     CommandInfo bindingunbindCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
@@ -10120,18 +10297,19 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             bindingunbindCommandParams);
-    bindingClusterCommandInfo.put("unbind", bindingunbindCommandInfo);
+    bindingClusterCommandInfoMap.put("unbind", bindingunbindCommandInfo);
     // Populate cluster
     ClusterInfo bindingClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId),
-            bindingClusterCommandInfo);
+            bindingClusterCommandInfoMap);
     clusterMap.put("binding", bindingClusterInfo);
-    Map<String, CommandInfo> bridgedDeviceBasicClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> bridgedDeviceBasicClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo bridgedDeviceBasicClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             bridgedDeviceBasic_ClusterCommandInfo);
     clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
@@ -10176,38 +10354,42 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            bridgedDeviceBasicClusterCommandInfoMap);
+    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
+    Map<String, CommandInfo> colorControlClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlcolorLoopSetCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlcolorLoopSetupdateFlagsCommandParameter =
-        new CommandParameter("updateFlags", int.class);
+    CommandParameterInfo colorControlcolorLoopSetCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
+        new CommandParameterInfo("updateFlags", int.class);
     colorControlcolorLoopSetCommandParams.put(
-        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameter);
+        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
 
-    CommandParameter colorControlcolorLoopSetactionCommandParameter =
-        new CommandParameter("action", int.class);
+    CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
+        new CommandParameterInfo("action", int.class);
     colorControlcolorLoopSetCommandParams.put(
-        "action", colorControlcolorLoopSetactionCommandParameter);
+        "action", colorControlcolorLoopSetactionCommandParameterInfo);
 
-    CommandParameter colorControlcolorLoopSetdirectionCommandParameter =
-        new CommandParameter("direction", int.class);
+    CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", int.class);
     colorControlcolorLoopSetCommandParams.put(
-        "direction", colorControlcolorLoopSetdirectionCommandParameter);
-
-    CommandParameter colorControlcolorLoopSettimeCommandParameter =
-        new CommandParameter("time", int.class);
-    colorControlcolorLoopSetCommandParams.put("time", colorControlcolorLoopSettimeCommandParameter);
+        "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
 
-    CommandParameter colorControlcolorLoopSetstartHueCommandParameter =
-        new CommandParameter("startHue", int.class);
+    CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
+        new CommandParameterInfo("time", int.class);
     colorControlcolorLoopSetCommandParams.put(
-        "startHue", colorControlcolorLoopSetstartHueCommandParameter);
+        "time", colorControlcolorLoopSettimeCommandParameterInfo);
 
-    CommandParameter colorControlcolorLoopSetoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
+        new CommandParameterInfo("startHue", int.class);
     colorControlcolorLoopSetCommandParams.put(
-        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameter);
+        "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlcolorLoopSetoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10218,6 +10400,17 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlcolorLoopSetCommandParams.put(
         "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlcolorLoopSetCommandParams.put(
+        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlcolorLoopSetCommandInfo =
@@ -10267,28 +10460,35 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlcolorLoopSetCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
     Map<String, CommandParameter> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlenhancedMoveHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlenhancedMoveHuemoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
+    CommandParameterInfo colorControlenhancedMoveHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
     colorControlenhancedMoveHueCommandParams.put(
-        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameter);
+        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveHuerateCommandParameter =
-        new CommandParameter("rate", int.class);
+    CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
     colorControlenhancedMoveHueCommandParams.put(
-        "rate", colorControlenhancedMoveHuerateCommandParameter);
+        "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlenhancedMoveHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameter);
+        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlenhancedMoveHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10299,6 +10499,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlenhancedMoveHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlenhancedMoveHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlenhancedMoveHueCommandInfo =
@@ -10353,33 +10559,41 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlenhancedMoveHueCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
     Map<String, CommandParameter> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put(
+        "enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlenhancedMoveToHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlenhancedMoveToHueenhancedHueCommandParameter =
-        new CommandParameter("enhancedHue", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
+        new CommandParameterInfo("enhancedHue", int.class);
     colorControlenhancedMoveToHueCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameter);
+        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHuedirectionCommandParameter =
-        new CommandParameter("direction", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", int.class);
     colorControlenhancedMoveToHueCommandParams.put(
-        "direction", colorControlenhancedMoveToHuedirectionCommandParameter);
+        "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHuetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlenhancedMoveToHueCommandParams.put(
-        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameter);
+        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlenhancedMoveToHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameter);
+        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlenhancedMoveToHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10390,6 +10604,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlenhancedMoveToHueCommandParams.put(
         "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlenhancedMoveToHueCommandParams.put(
+        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlenhancedMoveToHueCommandInfo =
@@ -10447,44 +10667,56 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlenhancedMoveToHueCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlenhancedMoveToHueAndSaturationCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameter =
-        new CommandParameter("enhancedHue", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
+        new CommandParameterInfo("enhancedHue", int.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameter);
+        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHueAndSaturationsaturationCommandParameter =
-        new CommandParameter("saturation", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", int.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameter);
+        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo
+        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
+            new CommandParameterInfo("transitionTime", int.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "transitionTime", colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameter);
+        "transitionTime",
+        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameter);
+        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
-    CommandParameter colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
+    CommandParameterInfo
+        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
+            new CommandParameterInfo("optionsOverride", int.class);
     colorControlenhancedMoveToHueAndSaturationCommandParams.put(
         "optionsOverride",
+<<<<<<< HEAD
 <<<<<<< HEAD
         colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlenhancedMoveToHueAndSaturationCommandInfo =
@@ -10537,34 +10769,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlenhancedMoveToHueAndSaturationCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlenhancedStepHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlenhancedStepHuestepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
+    CommandParameterInfo colorControlenhancedStepHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
     colorControlenhancedStepHueCommandParams.put(
-        "stepMode", colorControlenhancedStepHuestepModeCommandParameter);
+        "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedStepHuestepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
+    CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
     colorControlenhancedStepHueCommandParams.put(
-        "stepSize", colorControlenhancedStepHuestepSizeCommandParameter);
+        "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedStepHuetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlenhancedStepHueCommandParams.put(
-        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameter);
+        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlenhancedStepHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlenhancedStepHueCommandParams.put(
-        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameter);
+        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlenhancedStepHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10575,6 +10813,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlenhancedStepHueCommandParams.put(
         "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlenhancedStepHueCommandParams.put(
+        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlenhancedStepHueCommandInfo =
@@ -10620,26 +10864,34 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlenhancedStepHueCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("enhancedStepHue", colorControlenhancedStepHueCommandInfo);
     Map<String, CommandParameter> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put(
+        "enhancedStepHue", colorControlenhancedStepHueCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveColorCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveColorrateXCommandParameter =
-        new CommandParameter("rateX", int.class);
-    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameter);
+    CommandParameterInfo colorControlmoveColorCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
+        new CommandParameterInfo("rateX", int.class);
+    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
 
-    CommandParameter colorControlmoveColorrateYCommandParameter =
-        new CommandParameter("rateY", int.class);
-    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameter);
+    CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
+        new CommandParameterInfo("rateY", int.class);
+    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
 
-    CommandParameter colorControlmoveColoroptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveColorCommandParams.put(
-        "optionsMask", colorControlmoveColoroptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10650,6 +10902,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveColorCommandParams.put(
         "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveColorCommandParams.put(
+        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveColorCommandInfo =
@@ -10708,40 +10966,49 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveColorCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveColor", colorControlmoveColorCommandInfo);
     Map<String, CommandParameter> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("moveColor", colorControlmoveColorCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveColorTemperatureCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveColorTemperaturemoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
+    CommandParameterInfo colorControlmoveColorTemperatureCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
     colorControlmoveColorTemperatureCommandParams.put(
-        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameter);
+        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
 
-    CommandParameter colorControlmoveColorTemperaturerateCommandParameter =
-        new CommandParameter("rate", int.class);
+    CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
     colorControlmoveColorTemperatureCommandParams.put(
-        "rate", colorControlmoveColorTemperaturerateCommandParameter);
+        "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
 
-    CommandParameter colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
+    CommandParameterInfo
+        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMinimum", int.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMinimum",
-        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameter);
+        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
 
-    CommandParameter colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
+    CommandParameterInfo
+        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMaximum", int.class);
     colorControlmoveColorTemperatureCommandParams.put(
         "colorTemperatureMaximum",
-        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameter);
+        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
 
-    CommandParameter colorControlmoveColorTemperatureoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10752,6 +11019,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveColorTemperatureCommandInfo =
@@ -10799,27 +11072,25 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveColorTemperatureCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveHuemoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
-    colorControlmoveHueCommandParams.put("moveMode", colorControlmoveHuemoveModeCommandParameter);
-
-    CommandParameter colorControlmoveHuerateCommandParameter =
-        new CommandParameter("rate", int.class);
-    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameter);
-
-    CommandParameter colorControlmoveHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
     colorControlmoveHueCommandParams.put(
-        "optionsMask", colorControlmoveHueoptionsMaskCommandParameter);
+        "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10830,6 +11101,21 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveHueCommandParams.put(
         "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
+    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
+    colorControlmoveHueCommandParams.put(
+        "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveHueCommandParams.put(
+        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveHueCommandInfo =
@@ -10874,28 +11160,35 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveHueCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveHue", colorControlmoveHueCommandInfo);
     Map<String, CommandParameter> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("moveHue", colorControlmoveHueCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveSaturationCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveSaturationmoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
+    CommandParameterInfo colorControlmoveSaturationCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
     colorControlmoveSaturationCommandParams.put(
-        "moveMode", colorControlmoveSaturationmoveModeCommandParameter);
+        "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
 
-    CommandParameter colorControlmoveSaturationrateCommandParameter =
-        new CommandParameter("rate", int.class);
+    CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
     colorControlmoveSaturationCommandParams.put(
-        "rate", colorControlmoveSaturationrateCommandParameter);
+        "rate", colorControlmoveSaturationrateCommandParameterInfo);
 
-    CommandParameter colorControlmoveSaturationoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveSaturationCommandParams.put(
-        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10906,6 +11199,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveSaturationCommandParams.put(
         "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveSaturationCommandInfo =
@@ -10955,33 +11254,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveSaturationCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveSaturation", colorControlmoveSaturationCommandInfo);
     Map<String, CommandParameter> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("moveSaturation", colorControlmoveSaturationCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveToColorCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveToColorcolorXCommandParameter =
-        new CommandParameter("colorX", int.class);
+    CommandParameterInfo colorControlmoveToColorCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
+        new CommandParameterInfo("colorX", int.class);
     colorControlmoveToColorCommandParams.put(
-        "colorX", colorControlmoveToColorcolorXCommandParameter);
+        "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
 
-    CommandParameter colorControlmoveToColorcolorYCommandParameter =
-        new CommandParameter("colorY", int.class);
+    CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
+        new CommandParameterInfo("colorY", int.class);
     colorControlmoveToColorCommandParams.put(
-        "colorY", colorControlmoveToColorcolorYCommandParameter);
+        "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
 
-    CommandParameter colorControlmoveToColortransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlmoveToColorCommandParams.put(
-        "transitionTime", colorControlmoveToColortransitionTimeCommandParameter);
+        "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlmoveToColoroptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveToColorCommandParams.put(
-        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveToColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -10992,6 +11298,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveToColorCommandParams.put(
         "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveToColorCommandParams.put(
+        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveToColorCommandInfo =
@@ -11042,28 +11354,35 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveToColorCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveToColor", colorControlmoveToColorCommandInfo);
     Map<String, CommandParameter> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("moveToColor", colorControlmoveToColorCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveToColorTemperatureCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveToColorTemperaturecolorTemperatureCommandParameter =
-        new CommandParameter("colorTemperature", int.class);
+    CommandParameterInfo colorControlmoveToColorTemperatureCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
+        new CommandParameterInfo("colorTemperature", int.class);
     colorControlmoveToColorTemperatureCommandParams.put(
-        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameter);
+        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
 
-    CommandParameter colorControlmoveToColorTemperaturetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlmoveToColorTemperatureCommandParams.put(
-        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameter);
+        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlmoveToColorTemperatureoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveToColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11074,6 +11393,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveToColorTemperatureCommandParams.put(
         "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveToColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveToColorTemperatureCommandInfo =
@@ -11123,33 +11448,39 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveToColorTemperatureCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveToHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveToHuehueCommandParameter =
-        new CommandParameter("hue", int.class);
-    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameter);
+    CommandParameterInfo colorControlmoveToHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
+        new CommandParameterInfo("hue", int.class);
+    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHuedirectionCommandParameter =
-        new CommandParameter("direction", int.class);
+    CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
+        new CommandParameterInfo("direction", int.class);
     colorControlmoveToHueCommandParams.put(
-        "direction", colorControlmoveToHuedirectionCommandParameter);
+        "direction", colorControlmoveToHuedirectionCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHuetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlmoveToHueCommandParams.put(
-        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameter);
+        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveToHueCommandParams.put(
-        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveToHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11160,6 +11491,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveToHueCommandParams.put(
         "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveToHueCommandParams.put(
+        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveToHueCommandInfo =
@@ -11215,33 +11552,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveToHueCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveToHue", colorControlmoveToHueCommandInfo);
     Map<String, CommandParameter> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("moveToHue", colorControlmoveToHueCommandInfo);
+    Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveToHueAndSaturationCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveToHueAndSaturationhueCommandParameter =
-        new CommandParameter("hue", int.class);
+    CommandParameterInfo colorControlmoveToHueAndSaturationCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
+        new CommandParameterInfo("hue", int.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
-        "hue", colorControlmoveToHueAndSaturationhueCommandParameter);
+        "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHueAndSaturationsaturationCommandParameter =
-        new CommandParameter("saturation", int.class);
+    CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", int.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameter);
+        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHueAndSaturationtransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameter);
+        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlmoveToHueAndSaturationoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11252,6 +11596,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveToHueAndSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveToHueAndSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveToHueAndSaturationCommandInfo =
@@ -11301,29 +11651,35 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveToHueAndSaturationCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlmoveToSaturationCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlmoveToSaturationsaturationCommandParameter =
-        new CommandParameter("saturation", int.class);
+    CommandParameterInfo colorControlmoveToSaturationCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
+        new CommandParameterInfo("saturation", int.class);
     colorControlmoveToSaturationCommandParams.put(
-        "saturation", colorControlmoveToSaturationsaturationCommandParameter);
+        "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
 
-    CommandParameter colorControlmoveToSaturationtransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlmoveToSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameter);
+        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlmoveToSaturationoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlmoveToSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameter);
+        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlmoveToSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11334,6 +11690,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlmoveToSaturationCommandParams.put(
         "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlmoveToSaturationCommandParams.put(
+        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlmoveToSaturationCommandInfo =
@@ -11382,31 +11744,39 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlmoveToSaturationCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("moveToSaturation", colorControlmoveToSaturationCommandInfo);
     Map<String, CommandParameter> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put(
+        "moveToSaturation", colorControlmoveToSaturationCommandInfo);
+    Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlstepColorCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlstepColorstepXCommandParameter =
-        new CommandParameter("stepX", int.class);
-    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameter);
+    CommandParameterInfo colorControlstepColorCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
+        new CommandParameterInfo("stepX", int.class);
+    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
 
-    CommandParameter colorControlstepColorstepYCommandParameter =
-        new CommandParameter("stepY", int.class);
-    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameter);
+    CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
+        new CommandParameterInfo("stepY", int.class);
+    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
 
-    CommandParameter colorControlstepColortransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlstepColorCommandParams.put(
-        "transitionTime", colorControlstepColortransitionTimeCommandParameter);
+        "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlstepColoroptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlstepColorCommandParams.put(
-        "optionsMask", colorControlstepColoroptionsMaskCommandParameter);
+        "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlstepColoroptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11417,6 +11787,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlstepColorCommandParams.put(
         "optionsOverride", colorControlstepColoroptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlstepColorCommandParams.put(
+        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlstepColorCommandInfo =
@@ -11482,45 +11858,54 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlstepColorCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("stepColor", colorControlstepColorCommandInfo);
     Map<String, CommandParameter> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("stepColor", colorControlstepColorCommandInfo);
+    Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlstepColorTemperatureCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlstepColorTemperaturestepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
+    CommandParameterInfo colorControlstepColorTemperatureCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
     colorControlstepColorTemperatureCommandParams.put(
-        "stepMode", colorControlstepColorTemperaturestepModeCommandParameter);
+        "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
 
-    CommandParameter colorControlstepColorTemperaturestepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
+    CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
     colorControlstepColorTemperatureCommandParams.put(
-        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameter);
+        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
 
-    CommandParameter colorControlstepColorTemperaturetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlstepColorTemperatureCommandParams.put(
-        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameter);
+        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
+    CommandParameterInfo
+        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMinimum", int.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMinimum",
-        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameter);
+        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
 
-    CommandParameter colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
+    CommandParameterInfo
+        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
+            new CommandParameterInfo("colorTemperatureMaximum", int.class);
     colorControlstepColorTemperatureCommandParams.put(
         "colorTemperatureMaximum",
-        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameter);
+        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
 
-    CommandParameter colorControlstepColorTemperatureoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlstepColorTemperatureCommandParams.put(
-        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameter);
+        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlstepColorTemperatureoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11531,6 +11916,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlstepColorTemperatureCommandParams.put(
         "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlstepColorTemperatureCommandParams.put(
+        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlstepColorTemperatureCommandInfo =
@@ -11584,32 +11975,30 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlstepColorTemperatureCommandParams);
-    colorControlClusterCommandInfo.put(
+    colorControlClusterCommandInfoMap.put(
         "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlstepHueCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlstepHuestepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControlstepHueCommandParams.put("stepMode", colorControlstepHuestepModeCommandParameter);
-
-    CommandParameter colorControlstepHuestepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControlstepHueCommandParams.put("stepSize", colorControlstepHuestepSizeCommandParameter);
-
-    CommandParameter colorControlstepHuetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlstepHueCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
     colorControlstepHueCommandParams.put(
-        "transitionTime", colorControlstepHuetransitionTimeCommandParameter);
+        "stepMode", colorControlstepHuestepModeCommandParameterInfo);
 
-    CommandParameter colorControlstepHueoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
     colorControlstepHueCommandParams.put(
-        "optionsMask", colorControlstepHueoptionsMaskCommandParameter);
+        "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlstepHueoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11620,6 +12009,22 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlstepHueCommandParams.put(
         "optionsOverride", colorControlstepHueoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
+    colorControlstepHueCommandParams.put(
+        "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
+    colorControlstepHueCommandParams.put(
+        "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
+
+    CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlstepHueCommandParams.put(
+        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlstepHueCommandInfo =
@@ -11670,33 +12075,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlstepHueCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("stepHue", colorControlstepHueCommandInfo);
     Map<String, CommandParameter> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("stepHue", colorControlstepHueCommandInfo);
+    Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlstepSaturationCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlstepSaturationstepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
+    CommandParameterInfo colorControlstepSaturationCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
     colorControlstepSaturationCommandParams.put(
-        "stepMode", colorControlstepSaturationstepModeCommandParameter);
+        "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
 
-    CommandParameter colorControlstepSaturationstepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
+    CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
     colorControlstepSaturationCommandParams.put(
-        "stepSize", colorControlstepSaturationstepSizeCommandParameter);
+        "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
 
-    CommandParameter colorControlstepSaturationtransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     colorControlstepSaturationCommandParams.put(
-        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameter);
+        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
 
-    CommandParameter colorControlstepSaturationoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlstepSaturationCommandParams.put(
-        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameter);
+        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlstepSaturationoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11707,6 +12119,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlstepSaturationCommandParams.put(
         "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlstepSaturationCommandParams.put(
+        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlstepSaturationCommandInfo =
@@ -11745,18 +12163,25 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             colorControlstepSaturationCommandParams);
+<<<<<<< HEAD
     colorControlClusterCommandInfo.put("stepSaturation", colorControlstepSaturationCommandInfo);
     Map<String, CommandParameter> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    colorControlClusterCommandInfoMap.put("stepSaturation", colorControlstepSaturationCommandInfo);
+    Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter colorControlstopMoveStepCommandParameter =
-        new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter colorControlstopMoveStepoptionsMaskCommandParameter =
-        new CommandParameter("optionsMask", int.class);
+    CommandParameterInfo colorControlstopMoveStepCommandParameterInfo =
+        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
+        new CommandParameterInfo("optionsMask", int.class);
     colorControlstopMoveStepCommandParams.put(
-        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameter);
+        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter colorControlstopMoveStepoptionsOverrideCommandParameter =
         new CommandParameter("optionsOverride", int.class);
 <<<<<<< HEAD
@@ -11767,6 +12192,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlstopMoveStepCommandParams.put(
         "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionsOverride", int.class);
+    colorControlstopMoveStepCommandParams.put(
+        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo colorControlstopMoveStepCommandInfo =
@@ -11784,11 +12215,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             colorControlstopMoveStepCommandParams);
-    colorControlClusterCommandInfo.put("stopMoveStep", colorControlstopMoveStepCommandInfo);
+    colorControlClusterCommandInfoMap.put("stopMoveStep", colorControlstopMoveStepCommandInfo);
     // Populate cluster
     ClusterInfo colorControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             colorControl_ClusterCommandInfo);
     clusterMap.put("colorControl", colorControl_clusterInfo);
@@ -11814,16 +12246,24 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            colorControlClusterCommandInfoMap);
+    clusterMap.put("colorControl", colorControlClusterInfo);
+    Map<String, CommandInfo> contentLauncherClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter contentLauncherlaunchContentCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo contentLauncherlaunchContentCommandParameterInfo =
+        new CommandParameterInfo(
             "ContentLauncher",
             ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
-    CommandParameter contentLauncherlaunchContentautoPlayCommandParameter =
-        new CommandParameter("autoPlay", boolean.class);
+    CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
+        new CommandParameterInfo("autoPlay", boolean.class);
     contentLauncherlaunchContentCommandParams.put(
-        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameter);
+        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter contentLauncherlaunchContentdataCommandParameter =
         new CommandParameter("data", String.class);
 <<<<<<< HEAD
@@ -11834,6 +12274,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     contentLauncherlaunchContentCommandParams.put(
         "data", contentLauncherlaunchContentdataCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
+        new CommandParameterInfo("data", String.class);
+    contentLauncherlaunchContentCommandParams.put(
+        "data", contentLauncherlaunchContentdataCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo contentLauncherlaunchContentCommandInfo =
@@ -11871,19 +12317,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedLaunchContentResponseCallback(),
             contentLauncherlaunchContentCommandParams);
+<<<<<<< HEAD
     contentLauncherClusterCommandInfo.put("launchContent", contentLauncherlaunchContentCommandInfo);
     Map<String, CommandParameter> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    contentLauncherClusterCommandInfoMap.put(
+        "launchContent", contentLauncherlaunchContentCommandInfo);
+    Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter contentLauncherlaunchURLCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo contentLauncherlaunchURLCommandParameterInfo =
+        new CommandParameterInfo(
             "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
-    CommandParameter contentLauncherlaunchURLcontentURLCommandParameter =
-        new CommandParameter("contentURL", String.class);
+    CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
+        new CommandParameterInfo("contentURL", String.class);
     contentLauncherlaunchURLCommandParams.put(
-        "contentURL", contentLauncherlaunchURLcontentURLCommandParameter);
+        "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter contentLauncherlaunchURLdisplayStringCommandParameter =
         new CommandParameter("displayString", String.class);
 <<<<<<< HEAD
@@ -11892,8 +12346,14 @@ public Map<String, ClusterInfo> getClusterMap() {
 >>>>>>> 677ef48a5 (callback generation done)
 =======
     contentLauncherlaunchURLCommandParams.put(
-        "displayString", contentLauncherlaunchURLdisplayStringCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
+        "displayString", contentLauncherlaunchURLdisplayStringCommandParameter);
+>>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
+        new CommandParameterInfo("displayString", String.class);
+    contentLauncherlaunchURLCommandParams.put(
+        "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo contentLauncherlaunchURLCommandInfo =
@@ -11911,18 +12371,19 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedLaunchURLResponseCallback(),
             contentLauncherlaunchURLCommandParams);
-    contentLauncherClusterCommandInfo.put("launchURL", contentLauncherlaunchURLCommandInfo);
+    contentLauncherClusterCommandInfoMap.put("launchURL", contentLauncherlaunchURLCommandInfo);
     // Populate cluster
     ClusterInfo contentLauncherClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
-            contentLauncherClusterCommandInfo);
+            contentLauncherClusterCommandInfoMap);
     clusterMap.put("contentLauncher", contentLauncherClusterInfo);
-    Map<String, CommandInfo> descriptorClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> descriptorClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo descriptorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             descriptor_ClusterCommandInfo);
     clusterMap.put("descriptor", descriptor_clusterInfo);
@@ -11955,29 +12416,42 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            descriptorClusterCommandInfoMap);
+    clusterMap.put("descriptor", descriptorClusterInfo);
+    Map<String, CommandInfo> diagnosticLogsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter diagnosticLogsretrieveLogsRequestCommandParameter =
-        new CommandParameter("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter diagnosticLogsretrieveLogsRequestintentCommandParameter =
-        new CommandParameter("intent", int.class);
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
+        new CommandParameterInfo("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
+        new CommandParameterInfo("intent", int.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameter);
+        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
 
-    CommandParameter diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameter =
-        new CommandParameter("requestedProtocol", int.class);
+    CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
+        new CommandParameterInfo("requestedProtocol", int.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "requestedProtocol", diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameter);
+        "requestedProtocol",
+        diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
 
-    CommandParameter diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameter =
-        new CommandParameter("transferFileDesignator", byte[].class);
+    CommandParameterInfo
+        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
+            new CommandParameterInfo("transferFileDesignator", byte[].class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
         "transferFileDesignator",
+<<<<<<< HEAD
 <<<<<<< HEAD
         diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo diagnosticLogsretrieveLogsRequestCommandInfo =
@@ -11996,12 +12470,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             diagnosticLogsretrieveLogsRequestCommandParams);
-    diagnosticLogsClusterCommandInfo.put(
+    diagnosticLogsClusterCommandInfoMap.put(
         "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestCommandInfo);
     // Populate cluster
     ClusterInfo diagnosticLogsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             diagnosticLogs_ClusterCommandInfo);
     clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
@@ -12020,9 +12495,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> doorLockclearAllPinsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            diagnosticLogsClusterCommandInfoMap);
+    clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
+    Map<String, CommandInfo> doorLockClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> doorLockclearAllPinsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearAllPinsCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearAllPinsCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -12051,13 +12533,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearAllPinsResponseCallback(),
             doorLockclearAllPinsCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearAllPins", doorLockclearAllPinsCommandInfo);
     Map<String, CommandParameter> doorLockclearAllRfidsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("clearAllPins", doorLockclearAllPinsCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearAllRfidsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearAllRfidsCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearAllRfidsCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -12090,14 +12578,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearAllRfidsResponseCallback(),
             doorLockclearAllRfidsCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
     Map<String, CommandParameter> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearHolidayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearHolidayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockclearHolidaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
 <<<<<<< HEAD
@@ -12108,6 +12603,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockclearHolidayScheduleCommandParams.put(
         "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockclearHolidaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
+    doorLockclearHolidayScheduleCommandParams.put(
+        "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockclearHolidayScheduleCommandInfo =
@@ -12139,14 +12640,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearHolidayScheduleResponseCallback(),
             doorLockclearHolidayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockclearPinCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put(
+        "clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearPinCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearPinCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearPinCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockclearPinuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12155,6 +12664,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockclearPinuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockclearPinCommandInfo =
@@ -12185,14 +12699,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearPinResponseCallback(),
             doorLockclearPinCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearPin", doorLockclearPinCommandInfo);
     Map<String, CommandParameter> doorLockclearRfidCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("clearPin", doorLockclearPinCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearRfidCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearRfidCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearRfidCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockclearRfiduserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12201,6 +12722,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockclearRfiduserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockclearRfidCommandInfo =
@@ -12237,19 +12763,26 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearRfidResponseCallback(),
             doorLockclearRfidCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearRfid", doorLockclearRfidCommandInfo);
     Map<String, CommandParameter> doorLockclearWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("clearRfid", doorLockclearRfidCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearWeekdayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearWeekdayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLockclearWeekdaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLockclearWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLockclearWeekdaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLockclearWeekdayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12260,6 +12793,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockclearWeekdayScheduleCommandParams.put(
         "userId", doorLockclearWeekdayScheduleuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockclearWeekdayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockclearWeekdayScheduleCommandParams.put(
+        "userId", doorLockclearWeekdayScheduleuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockclearWeekdayScheduleCommandInfo =
@@ -12298,19 +12837,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearWeekdayScheduleResponseCallback(),
             doorLockclearWeekdayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockclearYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put(
+        "clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockclearYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockclearYeardayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockclearYeardayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
-    CommandParameter doorLockclearYeardaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLockclearYeardaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLockclearYeardayScheduleCommandParams.put(
-        "scheduleId", doorLockclearYeardaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLockclearYeardaySchedulescheduleIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLockclearYeardayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12321,6 +12868,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockclearYeardayScheduleCommandParams.put(
         "userId", doorLockclearYeardayScheduleuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockclearYeardayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockclearYeardayScheduleCommandParams.put(
+        "userId", doorLockclearYeardayScheduleuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockclearYeardayScheduleCommandInfo =
@@ -12354,14 +12907,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedClearYeardayScheduleResponseCallback(),
             doorLockclearYeardayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put(
+        "clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetHolidayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetHolidayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockgetHolidaySchedulescheduleIdCommandParameter =
         new CommandParameter("scheduleId", int.class);
 <<<<<<< HEAD
@@ -12372,6 +12933,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockgetHolidayScheduleCommandParams.put(
         "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetHolidaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
+    doorLockgetHolidayScheduleCommandParams.put(
+        "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetHolidayScheduleCommandInfo =
@@ -12403,14 +12970,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetHolidayScheduleResponseCallback(),
             doorLockgetHolidayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockgetLogRecordCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetLogRecordCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetLogRecordCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetLogRecordCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockgetLogRecordlogIndexCommandParameter =
         new CommandParameter("logIndex", int.class);
 <<<<<<< HEAD
@@ -12420,6 +12994,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockgetLogRecordCommandParams.put("logIndex", doorLockgetLogRecordlogIndexCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetLogRecordlogIndexCommandParameterInfo =
+        new CommandParameterInfo("logIndex", int.class);
+    doorLockgetLogRecordCommandParams.put(
+        "logIndex", doorLockgetLogRecordlogIndexCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetLogRecordCommandInfo =
@@ -12450,6 +13030,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetLogRecordResponseCallback(),
             doorLockgetLogRecordCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getLogRecord", doorLockgetLogRecordCommandInfo);
     Map<String, CommandParameter> doorLockgetPinCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -12465,6 +13046,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getLogRecord", doorLockgetLogRecordCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetPinCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo doorLockgetPinCommandParameterInfo =
+        new CommandParameterInfo(
+            "DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
+    CommandParameterInfo doorLockgetPinuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetPinCommandInfo =
@@ -12495,14 +13088,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetPinResponseCallback(),
             doorLockgetPinCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getPin", doorLockgetPinCommandInfo);
     Map<String, CommandParameter> doorLockgetRfidCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getPin", doorLockgetPinCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetRfidCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetRfidCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetRfidCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockgetRfiduserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12511,6 +13111,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetRfiduserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetRfidCommandInfo =
@@ -12542,14 +13147,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetRfidResponseCallback(),
             doorLockgetRfidCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getRfid", doorLockgetRfidCommandInfo);
     Map<String, CommandParameter> doorLockgetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getRfid", doorLockgetRfidCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetUserTypeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetUserTypeCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetUserTypeCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockgetUserTypeuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12558,6 +13170,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockgetUserTypeCommandParams.put("userId", doorLockgetUserTypeuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetUserTypeuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockgetUserTypeCommandParams.put("userId", doorLockgetUserTypeuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetUserTypeCommandInfo =
@@ -12593,19 +13210,26 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetUserTypeResponseCallback(),
             doorLockgetUserTypeCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getUserType", doorLockgetUserTypeCommandInfo);
     Map<String, CommandParameter> doorLockgetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getUserType", doorLockgetUserTypeCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetWeekdayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetWeekdayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLockgetWeekdaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLockgetWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLockgetWeekdaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLockgetWeekdayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12616,6 +13240,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockgetWeekdayScheduleCommandParams.put(
         "userId", doorLockgetWeekdayScheduleuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetWeekdayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockgetWeekdayScheduleCommandParams.put(
+        "userId", doorLockgetWeekdayScheduleuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetWeekdayScheduleCommandInfo =
@@ -12652,19 +13282,26 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetWeekdayScheduleResponseCallback(),
             doorLockgetWeekdayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockgetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockgetYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockgetYeardayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockgetYeardayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
-    CommandParameter doorLockgetYeardaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLockgetYeardaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLockgetYeardayScheduleCommandParams.put(
-        "scheduleId", doorLockgetYeardaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLockgetYeardaySchedulescheduleIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLockgetYeardayScheduleuserIdCommandParameter =
         new CommandParameter("userId", int.class);
 <<<<<<< HEAD
@@ -12675,6 +13312,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockgetYeardayScheduleCommandParams.put(
         "userId", doorLockgetYeardayScheduleuserIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockgetYeardayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLockgetYeardayScheduleCommandParams.put(
+        "userId", doorLockgetYeardayScheduleuserIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockgetYeardayScheduleCommandInfo =
@@ -12706,14 +13349,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetYeardayScheduleResponseCallback(),
             doorLockgetYeardayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
     Map<String, CommandParameter> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocklockDoorCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocklockDoorCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLocklockDoorpinCommandParameter =
         new CommandParameter("pin", byte[].class);
 <<<<<<< HEAD
@@ -12722,6 +13372,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocklockDoorpinCommandParameterInfo =
+        new CommandParameterInfo("pin", byte[].class);
+    doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocklockDoorCommandInfo =
@@ -12767,39 +13422,49 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedLockDoorResponseCallback(),
             doorLocklockDoorCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("lockDoor", doorLocklockDoorCommandInfo);
     Map<String, CommandParameter> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("lockDoor", doorLocklockDoorCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetHolidayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocksetHolidayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
-    CommandParameter doorLocksetHolidaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLocksetHolidaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLocksetHolidayScheduleCommandParams.put(
-        "scheduleId", doorLocksetHolidaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLocksetHolidaySchedulescheduleIdCommandParameterInfo);
 
-    CommandParameter doorLocksetHolidaySchedulelocalStartTimeCommandParameter =
-        new CommandParameter("localStartTime", long.class);
+    CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
+        new CommandParameterInfo("localStartTime", long.class);
     doorLocksetHolidayScheduleCommandParams.put(
-        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameter);
+        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
 
-    CommandParameter doorLocksetHolidaySchedulelocalEndTimeCommandParameter =
-        new CommandParameter("localEndTime", long.class);
+    CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
+        new CommandParameterInfo("localEndTime", long.class);
     doorLocksetHolidayScheduleCommandParams.put(
-        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameter);
+        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
 
-    CommandParameter doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameter =
-        new CommandParameter("operatingModeDuringHoliday", int.class);
+    CommandParameterInfo doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo =
+        new CommandParameterInfo("operatingModeDuringHoliday", int.class);
     doorLocksetHolidayScheduleCommandParams.put(
         "operatingModeDuringHoliday",
+<<<<<<< HEAD
 <<<<<<< HEAD
         doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetHolidayScheduleCommandInfo =
@@ -12843,25 +13508,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetHolidayScheduleResponseCallback(),
             doorLocksetHolidayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
     Map<String, CommandParameter> doorLocksetPinCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetPinCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetPinCommandParameter =
-        new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
-    CommandParameter doorLocksetPinuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-    doorLocksetPinCommandParams.put("userId", doorLocksetPinuserIdCommandParameter);
+    CommandParameterInfo doorLocksetPinCommandParameterInfo =
+        new CommandParameterInfo(
+            "DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
+    CommandParameterInfo doorLocksetPinuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLocksetPinCommandParams.put("userId", doorLocksetPinuserIdCommandParameterInfo);
 
-    CommandParameter doorLocksetPinuserStatusCommandParameter =
-        new CommandParameter("userStatus", int.class);
-    doorLocksetPinCommandParams.put("userStatus", doorLocksetPinuserStatusCommandParameter);
+    CommandParameterInfo doorLocksetPinuserStatusCommandParameterInfo =
+        new CommandParameterInfo("userStatus", int.class);
+    doorLocksetPinCommandParams.put("userStatus", doorLocksetPinuserStatusCommandParameterInfo);
 
-    CommandParameter doorLocksetPinuserTypeCommandParameter =
-        new CommandParameter("userType", int.class);
-    doorLocksetPinCommandParams.put("userType", doorLocksetPinuserTypeCommandParameter);
+    CommandParameterInfo doorLocksetPinuserTypeCommandParameterInfo =
+        new CommandParameterInfo("userType", int.class);
+    doorLocksetPinCommandParams.put("userType", doorLocksetPinuserTypeCommandParameterInfo);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     CommandParameter doorLock_setPin_pin_commandParameter =
         new CommandParameter("pin", byte[].class);
@@ -12871,6 +13544,11 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter doorLocksetPinpinCommandParameter = new CommandParameter("pin", byte[].class);
     doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocksetPinpinCommandParameterInfo =
+        new CommandParameterInfo("pin", byte[].class);
+    doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetPinCommandInfo =
@@ -12915,26 +13593,33 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetPinResponseCallback(),
             doorLocksetPinCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setPin", doorLocksetPinCommandInfo);
     Map<String, CommandParameter> doorLocksetRfidCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setPin", doorLocksetPinCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetRfidCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetRfidCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocksetRfidCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
-    CommandParameter doorLocksetRfiduserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-    doorLocksetRfidCommandParams.put("userId", doorLocksetRfiduserIdCommandParameter);
+    CommandParameterInfo doorLocksetRfiduserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLocksetRfidCommandParams.put("userId", doorLocksetRfiduserIdCommandParameterInfo);
 
-    CommandParameter doorLocksetRfiduserStatusCommandParameter =
-        new CommandParameter("userStatus", int.class);
-    doorLocksetRfidCommandParams.put("userStatus", doorLocksetRfiduserStatusCommandParameter);
+    CommandParameterInfo doorLocksetRfiduserStatusCommandParameterInfo =
+        new CommandParameterInfo("userStatus", int.class);
+    doorLocksetRfidCommandParams.put("userStatus", doorLocksetRfiduserStatusCommandParameterInfo);
 
-    CommandParameter doorLocksetRfiduserTypeCommandParameter =
-        new CommandParameter("userType", int.class);
-    doorLocksetRfidCommandParams.put("userType", doorLocksetRfiduserTypeCommandParameter);
+    CommandParameterInfo doorLocksetRfiduserTypeCommandParameterInfo =
+        new CommandParameterInfo("userType", int.class);
+    doorLocksetRfidCommandParams.put("userType", doorLocksetRfiduserTypeCommandParameterInfo);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     CommandParameter doorLock_setRfid_id_commandParameter =
         new CommandParameter("id", byte[].class);
@@ -12944,6 +13629,11 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter doorLocksetRfididCommandParameter = new CommandParameter("id", byte[].class);
     doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocksetRfididCommandParameterInfo =
+        new CommandParameterInfo("id", byte[].class);
+    doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetRfidCommandInfo =
@@ -12982,18 +13672,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetRfidResponseCallback(),
             doorLocksetRfidCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setRfid", doorLocksetRfidCommandInfo);
     Map<String, CommandParameter> doorLocksetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setRfid", doorLocksetRfidCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetUserTypeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetUserTypeCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocksetUserTypeCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
-    CommandParameter doorLocksetUserTypeuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-    doorLocksetUserTypeCommandParams.put("userId", doorLocksetUserTypeuserIdCommandParameter);
+    CommandParameterInfo doorLocksetUserTypeuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
+    doorLocksetUserTypeCommandParams.put("userId", doorLocksetUserTypeuserIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLocksetUserTypeuserTypeCommandParameter =
         new CommandParameter("userType", int.class);
 <<<<<<< HEAD
@@ -13003,6 +13700,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLocksetUserTypeCommandParams.put("userType", doorLocksetUserTypeuserTypeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocksetUserTypeuserTypeCommandParameterInfo =
+        new CommandParameterInfo("userType", int.class);
+    doorLocksetUserTypeCommandParams.put(
+        "userType", doorLocksetUserTypeuserTypeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetUserTypeCommandInfo =
@@ -13059,44 +13762,51 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetUserTypeResponseCallback(),
             doorLocksetUserTypeCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setUserType", doorLocksetUserTypeCommandInfo);
     Map<String, CommandParameter> doorLocksetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setUserType", doorLocksetUserTypeCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetWeekdayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetWeekdayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocksetWeekdayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
-    CommandParameter doorLocksetWeekdaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLocksetWeekdaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo);
 
-    CommandParameter doorLocksetWeekdayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
+    CommandParameterInfo doorLocksetWeekdayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "userId", doorLocksetWeekdayScheduleuserIdCommandParameter);
+        "userId", doorLocksetWeekdayScheduleuserIdCommandParameterInfo);
 
-    CommandParameter doorLocksetWeekdayScheduledaysMaskCommandParameter =
-        new CommandParameter("daysMask", int.class);
+    CommandParameterInfo doorLocksetWeekdayScheduledaysMaskCommandParameterInfo =
+        new CommandParameterInfo("daysMask", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "daysMask", doorLocksetWeekdayScheduledaysMaskCommandParameter);
+        "daysMask", doorLocksetWeekdayScheduledaysMaskCommandParameterInfo);
 
-    CommandParameter doorLocksetWeekdaySchedulestartHourCommandParameter =
-        new CommandParameter("startHour", int.class);
+    CommandParameterInfo doorLocksetWeekdaySchedulestartHourCommandParameterInfo =
+        new CommandParameterInfo("startHour", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "startHour", doorLocksetWeekdaySchedulestartHourCommandParameter);
+        "startHour", doorLocksetWeekdaySchedulestartHourCommandParameterInfo);
 
-    CommandParameter doorLocksetWeekdaySchedulestartMinuteCommandParameter =
-        new CommandParameter("startMinute", int.class);
+    CommandParameterInfo doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo =
+        new CommandParameterInfo("startMinute", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "startMinute", doorLocksetWeekdaySchedulestartMinuteCommandParameter);
+        "startMinute", doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo);
 
-    CommandParameter doorLocksetWeekdayScheduleendHourCommandParameter =
-        new CommandParameter("endHour", int.class);
+    CommandParameterInfo doorLocksetWeekdayScheduleendHourCommandParameterInfo =
+        new CommandParameterInfo("endHour", int.class);
     doorLocksetWeekdayScheduleCommandParams.put(
-        "endHour", doorLocksetWeekdayScheduleendHourCommandParameter);
+        "endHour", doorLocksetWeekdayScheduleendHourCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLocksetWeekdayScheduleendMinuteCommandParameter =
         new CommandParameter("endMinute", int.class);
 <<<<<<< HEAD
@@ -13107,6 +13817,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLocksetWeekdayScheduleCommandParams.put(
         "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocksetWeekdayScheduleendMinuteCommandParameterInfo =
+        new CommandParameterInfo("endMinute", int.class);
+    doorLocksetWeekdayScheduleCommandParams.put(
+        "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetWeekdayScheduleCommandInfo =
@@ -13157,29 +13873,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetWeekdayScheduleResponseCallback(),
             doorLocksetWeekdayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
     Map<String, CommandParameter> doorLocksetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLocksetYeardayScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLocksetYeardayScheduleCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLocksetYeardayScheduleCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
-    CommandParameter doorLocksetYeardaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
+    CommandParameterInfo doorLocksetYeardaySchedulescheduleIdCommandParameterInfo =
+        new CommandParameterInfo("scheduleId", int.class);
     doorLocksetYeardayScheduleCommandParams.put(
-        "scheduleId", doorLocksetYeardaySchedulescheduleIdCommandParameter);
+        "scheduleId", doorLocksetYeardaySchedulescheduleIdCommandParameterInfo);
 
-    CommandParameter doorLocksetYeardayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
+    CommandParameterInfo doorLocksetYeardayScheduleuserIdCommandParameterInfo =
+        new CommandParameterInfo("userId", int.class);
     doorLocksetYeardayScheduleCommandParams.put(
-        "userId", doorLocksetYeardayScheduleuserIdCommandParameter);
+        "userId", doorLocksetYeardayScheduleuserIdCommandParameterInfo);
 
-    CommandParameter doorLocksetYeardaySchedulelocalStartTimeCommandParameter =
-        new CommandParameter("localStartTime", long.class);
+    CommandParameterInfo doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo =
+        new CommandParameterInfo("localStartTime", long.class);
     doorLocksetYeardayScheduleCommandParams.put(
-        "localStartTime", doorLocksetYeardaySchedulelocalStartTimeCommandParameter);
+        "localStartTime", doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLocksetYeardaySchedulelocalEndTimeCommandParameter =
         new CommandParameter("localEndTime", long.class);
 <<<<<<< HEAD
@@ -13190,6 +13913,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLocksetYeardayScheduleCommandParams.put(
         "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo =
+        new CommandParameterInfo("localEndTime", long.class);
+    doorLocksetYeardayScheduleCommandParams.put(
+        "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLocksetYeardayScheduleCommandInfo =
@@ -13223,14 +13952,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedSetYeardayScheduleResponseCallback(),
             doorLocksetYeardayScheduleCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
     Map<String, CommandParameter> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
+    Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockunlockDoorCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockunlockDoorCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter doorLockunlockDoorpinCommandParameter =
         new CommandParameter("pin", byte[].class);
 <<<<<<< HEAD
@@ -13239,6 +13975,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockunlockDoorpinCommandParameterInfo =
+        new CommandParameterInfo("pin", byte[].class);
+    doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockunlockDoorCommandInfo =
@@ -13275,19 +14016,26 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedUnlockDoorResponseCallback(),
             doorLockunlockDoorCommandParams);
+<<<<<<< HEAD
     doorLockClusterCommandInfo.put("unlockDoor", doorLockunlockDoorCommandInfo);
     Map<String, CommandParameter> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    doorLockClusterCommandInfoMap.put("unlockDoor", doorLockunlockDoorCommandInfo);
+    Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter doorLockunlockWithTimeoutCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo doorLockunlockWithTimeoutCommandParameterInfo =
+        new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
-    CommandParameter doorLockunlockWithTimeouttimeoutInSecondsCommandParameter =
-        new CommandParameter("timeoutInSeconds", int.class);
+    CommandParameterInfo doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo =
+        new CommandParameterInfo("timeoutInSeconds", int.class);
     doorLockunlockWithTimeoutCommandParams.put(
-        "timeoutInSeconds", doorLockunlockWithTimeouttimeoutInSecondsCommandParameter);
+        "timeoutInSeconds", doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter doorLockunlockWithTimeoutpinCommandParameter =
         new CommandParameter("pin", byte[].class);
 <<<<<<< HEAD
@@ -13297,6 +14045,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     doorLockunlockWithTimeoutCommandParams.put("pin", doorLockunlockWithTimeoutpinCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo doorLockunlockWithTimeoutpinCommandParameterInfo =
+        new CommandParameterInfo("pin", byte[].class);
+    doorLockunlockWithTimeoutCommandParams.put(
+        "pin", doorLockunlockWithTimeoutpinCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo doorLockunlockWithTimeoutCommandInfo =
@@ -13314,18 +14068,19 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedUnlockWithTimeoutResponseCallback(),
             doorLockunlockWithTimeoutCommandParams);
-    doorLockClusterCommandInfo.put("unlockWithTimeout", doorLockunlockWithTimeoutCommandInfo);
+    doorLockClusterCommandInfoMap.put("unlockWithTimeout", doorLockunlockWithTimeoutCommandInfo);
     // Populate cluster
     ClusterInfo doorLockClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
-            doorLockClusterCommandInfo);
+            doorLockClusterCommandInfoMap);
     clusterMap.put("doorLock", doorLockClusterInfo);
-    Map<String, CommandInfo> electricalMeasurementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> electricalMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo electricalMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             electricalMeasurement_ClusterCommandInfo);
     clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
@@ -13344,9 +14099,17 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> ethernetNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            electricalMeasurementClusterCommandInfoMap);
+    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
+    Map<String, CommandInfo> ethernetNetworkDiagnosticsClusterCommandInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter ethernetNetworkDiagnosticsresetCountsCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo ethernetNetworkDiagnosticsresetCountsCommandParameterInfo =
+        new CommandParameterInfo(
             "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -13362,27 +14125,28 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             ethernetNetworkDiagnosticsresetCountsCommandParams);
-    ethernetNetworkDiagnosticsClusterCommandInfo.put(
+    ethernetNetworkDiagnosticsClusterCommandInfoMap.put(
         "resetCounts", ethernetNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
     ClusterInfo ethernetNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId),
-            ethernetNetworkDiagnosticsClusterCommandInfo);
+            ethernetNetworkDiagnosticsClusterCommandInfoMap);
     clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> fixedLabelClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> fixedLabelClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo fixedLabelClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
-            fixedLabelClusterCommandInfo);
+            fixedLabelClusterCommandInfoMap);
     clusterMap.put("fixedLabel", fixedLabelClusterInfo);
-    Map<String, CommandInfo> flowMeasurementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> flowMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo flowMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             flowMeasurement_ClusterCommandInfo);
     clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
@@ -13413,21 +14177,30 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            flowMeasurementClusterCommandInfoMap);
+    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
+    Map<String, CommandInfo> generalCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioningarmFailSafeCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo generalCommissioningarmFailSafeCommandParameterInfo =
+        new CommandParameterInfo(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
-    CommandParameter generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameter =
-        new CommandParameter("expiryLengthSeconds", int.class);
+    CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
+        new CommandParameterInfo("expiryLengthSeconds", int.class);
     generalCommissioningarmFailSafeCommandParams.put(
-        "expiryLengthSeconds", generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameter);
+        "expiryLengthSeconds",
+        generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
 
-    CommandParameter generalCommissioningarmFailSafebreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     generalCommissioningarmFailSafeCommandParams.put(
-        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameter);
+        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter generalCommissioningarmFailSafetimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -13438,6 +14211,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     generalCommissioningarmFailSafeCommandParams.put(
         "timeoutMs", generalCommissioningarmFailSafetimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo generalCommissioningarmFailSafetimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    generalCommissioningarmFailSafeCommandParams.put(
+        "timeoutMs", generalCommissioningarmFailSafetimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo generalCommissioningarmFailSafeCommandInfo =
@@ -13471,14 +14250,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedArmFailSafeResponseCallback(),
             generalCommissioningarmFailSafeCommandParams);
-    generalCommissioningClusterCommandInfo.put(
+    generalCommissioningClusterCommandInfoMap.put(
         "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> generalCommissioningcommissioningCompleteCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioningcommissioningCompleteCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo generalCommissioningcommissioningCompleteCommandParameterInfo =
+        new CommandParameterInfo(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
@@ -13531,31 +14315,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedCommissioningCompleteResponseCallback(),
             generalCommissioningcommissioningCompleteCommandParams);
-    generalCommissioningClusterCommandInfo.put(
+    generalCommissioningClusterCommandInfoMap.put(
         "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> generalCommissioningsetRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter generalCommissioningsetRegulatoryConfigCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigCommandParameterInfo =
+        new CommandParameterInfo(
             "GeneralCommissioning",
             ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
-    CommandParameter generalCommissioningsetRegulatoryConfiglocationCommandParameter =
-        new CommandParameter("location", int.class);
+    CommandParameterInfo generalCommissioningsetRegulatoryConfiglocationCommandParameterInfo =
+        new CommandParameterInfo("location", int.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "location", generalCommissioningsetRegulatoryConfiglocationCommandParameter);
+        "location", generalCommissioningsetRegulatoryConfiglocationCommandParameterInfo);
 
-    CommandParameter generalCommissioningsetRegulatoryConfigcountryCodeCommandParameter =
-        new CommandParameter("countryCode", String.class);
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
+        new CommandParameterInfo("countryCode", String.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameter);
+        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
 
-    CommandParameter generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameter);
+        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -13566,6 +14356,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     generalCommissioningsetRegulatoryConfigCommandParams.put(
         "timeoutMs", generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    generalCommissioningsetRegulatoryConfigCommandParams.put(
+        "timeoutMs", generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo generalCommissioningsetRegulatoryConfigCommandInfo =
@@ -13586,26 +14382,27 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedSetRegulatoryConfigResponseCallback(),
             generalCommissioningsetRegulatoryConfigCommandParams);
-    generalCommissioningClusterCommandInfo.put(
+    generalCommissioningClusterCommandInfoMap.put(
         "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigCommandInfo);
     // Populate cluster
     ClusterInfo generalCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
-            generalCommissioningClusterCommandInfo);
+            generalCommissioningClusterCommandInfoMap);
     clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
-    Map<String, CommandInfo> generalDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> generalDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo generalDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
-            generalDiagnosticsClusterCommandInfo);
+            generalDiagnosticsClusterCommandInfoMap);
     clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
-    Map<String, CommandInfo> groupKeyManagementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> groupKeyManagementClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo groupKeyManagementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             groupKeyManagement_ClusterCommandInfo);
     clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
@@ -13630,13 +14427,22 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            groupKeyManagementClusterCommandInfoMap);
+    clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
+    Map<String, CommandInfo> groupsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter groupsaddGroupCommandParameter =
-        new CommandParameter("Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
-    CommandParameter groupsaddGroupgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameter);
+    CommandParameterInfo groupsaddGroupCommandParameterInfo =
+        new CommandParameterInfo(
+            "Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
+    CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter groupsaddGroupgroupNameCommandParameter =
         new CommandParameter("groupName", String.class);
 <<<<<<< HEAD
@@ -13645,6 +14451,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
+        new CommandParameterInfo("groupName", String.class);
+    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo groupsaddGroupCommandInfo =
@@ -13682,18 +14493,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedAddGroupResponseCallback(),
             groupsaddGroupCommandParams);
+<<<<<<< HEAD
     groupsClusterCommandInfo.put("addGroup", groupsaddGroupCommandInfo);
     Map<String, CommandParameter> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    groupsClusterCommandInfoMap.put("addGroup", groupsaddGroupCommandInfo);
+    Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter groupsaddGroupIfIdentifyingCommandParameter =
-        new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter groupsaddGroupIfIdentifyinggroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
+    CommandParameterInfo groupsaddGroupIfIdentifyingCommandParameterInfo =
+        new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
     groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameter);
+        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter groupsaddGroupIfIdentifyinggroupNameCommandParameter =
         new CommandParameter("groupName", String.class);
 <<<<<<< HEAD
@@ -13704,6 +14522,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsaddGroupIfIdentifyingCommandParams.put(
         "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
+        new CommandParameterInfo("groupName", String.class);
+    groupsaddGroupIfIdentifyingCommandParams.put(
+        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo groupsaddGroupIfIdentifyingCommandInfo =
@@ -13740,19 +14564,27 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             groupsaddGroupIfIdentifyingCommandParams);
+<<<<<<< HEAD
     groupsClusterCommandInfo.put("addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
     Map<String, CommandParameter> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    groupsClusterCommandInfoMap.put(
+        "addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
+    Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter groupsgetGroupMembershipCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo groupsgetGroupMembershipCommandParameterInfo =
+        new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
-    CommandParameter groupsgetGroupMembershipgroupCountCommandParameter =
-        new CommandParameter("groupCount", int.class);
+    CommandParameterInfo groupsgetGroupMembershipgroupCountCommandParameterInfo =
+        new CommandParameterInfo("groupCount", int.class);
     groupsgetGroupMembershipCommandParams.put(
-        "groupCount", groupsgetGroupMembershipgroupCountCommandParameter);
+        "groupCount", groupsgetGroupMembershipgroupCountCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter groupsgetGroupMembershipgroupListCommandParameter =
         new CommandParameter("groupList", int.class);
 <<<<<<< HEAD
@@ -13763,6 +14595,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsgetGroupMembershipCommandParams.put(
         "groupList", groupsgetGroupMembershipgroupListCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
+        new CommandParameterInfo("groupList", int.class);
+    groupsgetGroupMembershipCommandParams.put(
+        "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo groupsgetGroupMembershipCommandInfo =
@@ -13792,6 +14630,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetGroupMembershipResponseCallback(),
             groupsgetGroupMembershipCommandParams);
+<<<<<<< HEAD
     groupsClusterCommandInfo.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
     Map<String, CommandParameter> groupsremoveAllGroupsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -13800,6 +14639,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter groupsremoveAllGroupsCommandParameter =
         new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    groupsClusterCommandInfoMap.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
+    Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo groupsremoveAllGroupsCommandParameterInfo =
+        new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo groupsremoveAllGroupsCommandInfo =
         new CommandInfo(
@@ -13827,14 +14674,21 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             groupsremoveAllGroupsCommandParams);
+<<<<<<< HEAD
     groupsClusterCommandInfo.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
     Map<String, CommandParameter> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    groupsClusterCommandInfoMap.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
+    Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter groupsremoveGroupCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo groupsremoveGroupCommandParameterInfo =
+        new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter groupsremoveGroupgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
 <<<<<<< HEAD
@@ -13843,6 +14697,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo groupsremoveGroupCommandInfo =
@@ -13874,6 +14733,7 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedRemoveGroupResponseCallback(),
             groupsremoveGroupCommandParams);
+<<<<<<< HEAD
     groupsClusterCommandInfo.put("removeGroup", groupsremoveGroupCommandInfo);
     Map<String, CommandParameter> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -13889,6 +14749,18 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    groupsClusterCommandInfoMap.put("removeGroup", groupsremoveGroupCommandInfo);
+    Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo groupsviewGroupCommandParameterInfo =
+        new CommandParameterInfo(
+            "Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
+    CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo groupsviewGroupCommandInfo =
@@ -13905,11 +14777,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedViewGroupResponseCallback(),
             groupsviewGroupCommandParams);
-    groupsClusterCommandInfo.put("viewGroup", groupsviewGroupCommandInfo);
+    groupsClusterCommandInfoMap.put("viewGroup", groupsviewGroupCommandInfo);
     // Populate cluster
     ClusterInfo groupsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             groups_ClusterCommandInfo);
     clusterMap.put("groups", groups_clusterInfo);
@@ -13943,6 +14816,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     identifyidentifyCommandParams.put("identifyTime", identifyidentifyidentifyTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            groupsClusterCommandInfoMap);
+    clusterMap.put("groups", groupsClusterInfo);
+    Map<String, CommandInfo> identifyClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> identifyidentifyCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo identifyidentifyCommandParameterInfo =
+        new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
+        new CommandParameterInfo("identifyTime", int.class);
+    identifyidentifyCommandParams.put(
+        "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo identifyidentifyCommandInfo =
@@ -13970,13 +14857,19 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             identifyidentifyCommandParams);
+<<<<<<< HEAD
     identifyClusterCommandInfo.put("identify", identifyidentifyCommandInfo);
     Map<String, CommandParameter> identifyidentifyQueryCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    identifyClusterCommandInfoMap.put("identify", identifyidentifyCommandInfo);
+    Map<String, CommandParameterInfo> identifyidentifyQueryCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter identifyidentifyQueryCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo identifyidentifyQueryCommandParameterInfo =
+        new CommandParameterInfo(
             "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -14012,18 +14905,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedIdentifyQueryResponseCallback(),
             identifyidentifyQueryCommandParams);
+<<<<<<< HEAD
     identifyClusterCommandInfo.put("identifyQuery", identifyidentifyQueryCommandInfo);
     Map<String, CommandParameter> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    identifyClusterCommandInfoMap.put("identifyQuery", identifyidentifyQueryCommandInfo);
+    Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter identifytriggerEffectCommandParameter =
-        new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter identifytriggerEffecteffectIdentifierCommandParameter =
-        new CommandParameter("effectIdentifier", int.class);
+    CommandParameterInfo identifytriggerEffectCommandParameterInfo =
+        new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
+        new CommandParameterInfo("effectIdentifier", int.class);
     identifytriggerEffectCommandParams.put(
-        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameter);
+        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter identifytriggerEffecteffectVariantCommandParameter =
         new CommandParameter("effectVariant", int.class);
 <<<<<<< HEAD
@@ -14034,6 +14934,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifytriggerEffectCommandParams.put(
         "effectVariant", identifytriggerEffecteffectVariantCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
+        new CommandParameterInfo("effectVariant", int.class);
+    identifytriggerEffectCommandParams.put(
+        "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo identifytriggerEffectCommandInfo =
@@ -14051,11 +14957,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             identifytriggerEffectCommandParams);
-    identifyClusterCommandInfo.put("triggerEffect", identifytriggerEffectCommandInfo);
+    identifyClusterCommandInfoMap.put("triggerEffect", identifytriggerEffectCommandInfo);
     // Populate cluster
     ClusterInfo identifyClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             identify_ClusterCommandInfo);
     clusterMap.put("identify", identify_clusterInfo);
@@ -14076,10 +14983,18 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            identifyClusterCommandInfoMap);
+    clusterMap.put("identify", identifyClusterInfo);
+    Map<String, CommandInfo> keypadInputClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter keypadInputsendKeyCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo keypadInputsendKeyCommandParameterInfo =
+        new CommandParameterInfo(
             "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter keypadInputsendKeykeyCodeCommandParameter =
         new CommandParameter("keyCode", int.class);
 <<<<<<< HEAD
@@ -14088,6 +15003,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
+        new CommandParameterInfo("keyCode", int.class);
+    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo keypadInputsendKeyCommandInfo =
@@ -14104,11 +15024,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedSendKeyResponseCallback(),
             keypadInputsendKeyCommandParams);
-    keypadInputClusterCommandInfo.put("sendKey", keypadInputsendKeyCommandInfo);
+    keypadInputClusterCommandInfoMap.put("sendKey", keypadInputsendKeyCommandInfo);
     // Populate cluster
     ClusterInfo keypadInputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             keypadInput_ClusterCommandInfo);
     clusterMap.put("keypadInput", keypadInput_clusterInfo);
@@ -14140,20 +15061,29 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            keypadInputClusterCommandInfoMap);
+    clusterMap.put("keypadInput", keypadInputClusterInfo);
+    Map<String, CommandInfo> levelControlClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> levelControlmoveCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlmoveCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlmovemoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
-    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameter);
+    CommandParameterInfo levelControlmoveCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
+    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
 
-    CommandParameter levelControlmoverateCommandParameter = new CommandParameter("rate", int.class);
-    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameter);
+    CommandParameterInfo levelControlmoverateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
+    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
 
-    CommandParameter levelControlmoveoptionMaskCommandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameter);
+    CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", int.class);
+    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlmoveoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
 <<<<<<< HEAD
@@ -14164,6 +15094,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlmoveCommandParams.put(
         "optionOverride", levelControlmoveoptionOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", int.class);
+    levelControlmoveCommandParams.put(
+        "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlmoveCommandInfo =
@@ -14208,27 +15144,30 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlmoveCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("move", levelControlmoveCommandInfo);
     Map<String, CommandParameter> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    levelControlClusterCommandInfoMap.put("move", levelControlmoveCommandInfo);
+    Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlmoveToLevelCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlmoveToLevellevelCommandParameter =
-        new CommandParameter("level", int.class);
-    levelControlmoveToLevelCommandParams.put("level", levelControlmoveToLevellevelCommandParameter);
-
-    CommandParameter levelControlmoveToLeveltransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo levelControlmoveToLevelCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
+        new CommandParameterInfo("level", int.class);
     levelControlmoveToLevelCommandParams.put(
-        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameter);
+        "level", levelControlmoveToLevellevelCommandParameterInfo);
 
-    CommandParameter levelControlmoveToLeveloptionMaskCommandParameter =
-        new CommandParameter("optionMask", int.class);
+    CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     levelControlmoveToLevelCommandParams.put(
-        "optionMask", levelControlmoveToLeveloptionMaskCommandParameter);
+        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlmoveToLeveloptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
 <<<<<<< HEAD
@@ -14239,6 +15178,17 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlmoveToLevelCommandParams.put(
         "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", int.class);
+    levelControlmoveToLevelCommandParams.put(
+        "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
+
+    CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", int.class);
+    levelControlmoveToLevelCommandParams.put(
+        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlmoveToLevelCommandInfo =
@@ -14278,18 +15228,25 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlmoveToLevelCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("moveToLevel", levelControlmoveToLevelCommandInfo);
     Map<String, CommandParameter> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    levelControlClusterCommandInfoMap.put("moveToLevel", levelControlmoveToLevelCommandInfo);
+    Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlmoveToLevelWithOnOffCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlmoveToLevelWithOnOfflevelCommandParameter =
-        new CommandParameter("level", int.class);
+    CommandParameterInfo levelControlmoveToLevelWithOnOffCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
+        new CommandParameterInfo("level", int.class);
     levelControlmoveToLevelWithOnOffCommandParams.put(
-        "level", levelControlmoveToLevelWithOnOfflevelCommandParameter);
+        "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
 <<<<<<< HEAD
@@ -14300,6 +15257,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlmoveToLevelWithOnOffCommandParams.put(
         "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
+    levelControlmoveToLevelWithOnOffCommandParams.put(
+        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlmoveToLevelWithOnOffCommandInfo =
@@ -14335,19 +15298,25 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlmoveToLevelWithOnOffCommandParams);
-    levelControlClusterCommandInfo.put(
+    levelControlClusterCommandInfoMap.put(
         "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlmoveWithOnOffCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlmoveWithOnOffmoveModeCommandParameter =
-        new CommandParameter("moveMode", int.class);
+    CommandParameterInfo levelControlmoveWithOnOffCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
+        new CommandParameterInfo("moveMode", int.class);
     levelControlmoveWithOnOffCommandParams.put(
-        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameter);
+        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlmoveWithOnOffrateCommandParameter =
         new CommandParameter("rate", int.class);
 <<<<<<< HEAD
@@ -14358,6 +15327,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlmoveWithOnOffCommandParams.put(
         "rate", levelControlmoveWithOnOffrateCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
+        new CommandParameterInfo("rate", int.class);
+    levelControlmoveWithOnOffCommandParams.put(
+        "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlmoveWithOnOffCommandInfo =
@@ -14403,30 +15378,37 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlmoveWithOnOffCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
     Map<String, CommandParameter> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    levelControlClusterCommandInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
+    Map<String, CommandParameterInfo> levelControlstepCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlstepCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlstepstepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
-    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameter);
+    CommandParameterInfo levelControlstepCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
+    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
 
-    CommandParameter levelControlstepstepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
-    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameter);
+    CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
+    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
 
-    CommandParameter levelControlsteptransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
+    CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
     levelControlstepCommandParams.put(
-        "transitionTime", levelControlsteptransitionTimeCommandParameter);
+        "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
 
-    CommandParameter levelControlstepoptionMaskCommandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameter);
+    CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", int.class);
+    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlstepoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
 <<<<<<< HEAD
@@ -14437,6 +15419,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlstepCommandParams.put(
         "optionOverride", levelControlstepoptionOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", int.class);
+    levelControlstepCommandParams.put(
+        "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlstepCommandInfo =
@@ -14479,23 +15467,30 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlstepCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("step", levelControlstepCommandInfo);
     Map<String, CommandParameter> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    levelControlClusterCommandInfoMap.put("step", levelControlstepCommandInfo);
+    Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlstepWithOnOffCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlstepWithOnOffstepModeCommandParameter =
-        new CommandParameter("stepMode", int.class);
+    CommandParameterInfo levelControlstepWithOnOffCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
+        new CommandParameterInfo("stepMode", int.class);
     levelControlstepWithOnOffCommandParams.put(
-        "stepMode", levelControlstepWithOnOffstepModeCommandParameter);
+        "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
 
-    CommandParameter levelControlstepWithOnOffstepSizeCommandParameter =
-        new CommandParameter("stepSize", int.class);
+    CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
+        new CommandParameterInfo("stepSize", int.class);
     levelControlstepWithOnOffCommandParams.put(
-        "stepSize", levelControlstepWithOnOffstepSizeCommandParameter);
+        "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlstepWithOnOfftransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
 <<<<<<< HEAD
@@ -14506,6 +15501,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlstepWithOnOffCommandParams.put(
         "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
+    levelControlstepWithOnOffCommandParams.put(
+        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlstepWithOnOffCommandInfo =
@@ -14542,17 +15543,24 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlstepWithOnOffCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
     Map<String, CommandParameter> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    levelControlClusterCommandInfoMap.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
+    Map<String, CommandParameterInfo> levelControlstopCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter levelControlstopCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter levelControlstopoptionMaskCommandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameter);
+    CommandParameterInfo levelControlstopCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
+        new CommandParameterInfo("optionMask", int.class);
+    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter levelControlstopoptionOverrideCommandParameter =
         new CommandParameter("optionOverride", int.class);
 <<<<<<< HEAD
@@ -14563,6 +15571,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlstopCommandParams.put(
         "optionOverride", levelControlstopoptionOverrideCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
+        new CommandParameterInfo("optionOverride", int.class);
+    levelControlstopCommandParams.put(
+        "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo levelControlstopCommandInfo =
@@ -14591,6 +15605,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             levelControlstopCommandParams);
+<<<<<<< HEAD
     levelControlClusterCommandInfo.put("stop", levelControlstopCommandInfo);
     Map<String, CommandParameter> levelControlstopWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -14599,6 +15614,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter levelControlstopWithOnOffCommandParameter =
         new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    levelControlClusterCommandInfoMap.put("stop", levelControlstopCommandInfo);
+    Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo levelControlstopWithOnOffCommandParameterInfo =
+        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo levelControlstopWithOnOffCommandInfo =
         new CommandInfo(
@@ -14612,11 +15635,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             levelControlstopWithOnOffCommandParams);
-    levelControlClusterCommandInfo.put("stopWithOnOff", levelControlstopWithOnOffCommandInfo);
+    levelControlClusterCommandInfoMap.put("stopWithOnOff", levelControlstopWithOnOffCommandInfo);
     // Populate cluster
     ClusterInfo levelControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             levelControl_ClusterCommandInfo);
     clusterMap.put("levelControl", levelControl_clusterInfo);
@@ -14639,6 +15663,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter lowPowersleepCommandParameter =
         new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            levelControlClusterCommandInfoMap);
+    clusterMap.put("levelControl", levelControlClusterInfo);
+    Map<String, CommandInfo> lowPowerClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> lowPowersleepCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo lowPowersleepCommandParameterInfo =
+        new CommandParameterInfo("LowPower", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo lowPowersleepCommandInfo =
         new CommandInfo(
@@ -14651,11 +15685,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             lowPowersleepCommandParams);
-    lowPowerClusterCommandInfo.put("sleep", lowPowersleepCommandInfo);
+    lowPowerClusterCommandInfoMap.put("sleep", lowPowersleepCommandInfo);
     // Populate cluster
     ClusterInfo lowPowerClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             lowPower_ClusterCommandInfo);
     clusterMap.put("lowPower", lowPower_clusterInfo);
@@ -14678,6 +15713,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter mediaInputhideInputStatusCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            lowPowerClusterCommandInfoMap);
+    clusterMap.put("lowPower", lowPowerClusterInfo);
+    Map<String, CommandInfo> mediaInputClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo mediaInputhideInputStatusCommandParameterInfo =
+        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo mediaInputhideInputStatusCommandInfo =
         new CommandInfo(
@@ -14707,17 +15752,24 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             mediaInputhideInputStatusCommandParams);
+<<<<<<< HEAD
     mediaInputClusterCommandInfo.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
     Map<String, CommandParameter> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaInputClusterCommandInfoMap.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
+    Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaInputrenameInputCommandParameter =
-        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter mediaInputrenameInputindexCommandParameter =
-        new CommandParameter("index", int.class);
-    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameter);
+    CommandParameterInfo mediaInputrenameInputCommandParameterInfo =
+        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
+        new CommandParameterInfo("index", int.class);
+    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter mediaInputrenameInputnameCommandParameter =
         new CommandParameter("name", String.class);
 <<<<<<< HEAD
@@ -14726,6 +15778,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
+        new CommandParameterInfo("name", String.class);
+    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo mediaInputrenameInputCommandInfo =
@@ -14756,6 +15813,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             mediaInputrenameInputCommandParams);
+<<<<<<< HEAD
     mediaInputClusterCommandInfo.put("renameInput", mediaInputrenameInputCommandInfo);
     Map<String, CommandParameter> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -14772,6 +15830,17 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaInputClusterCommandInfoMap.put("renameInput", mediaInputrenameInputCommandInfo);
+    Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo mediaInputselectInputCommandParameterInfo =
+        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
+        new CommandParameterInfo("index", int.class);
+    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo mediaInputselectInputCommandInfo =
@@ -14798,6 +15867,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             mediaInputselectInputCommandParams);
+<<<<<<< HEAD
     mediaInputClusterCommandInfo.put("selectInput", mediaInputselectInputCommandInfo);
     Map<String, CommandParameter> mediaInputshowInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -14806,6 +15876,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter mediaInputshowInputStatusCommandParameter =
         new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    mediaInputClusterCommandInfoMap.put("selectInput", mediaInputselectInputCommandInfo);
+    Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo mediaInputshowInputStatusCommandParameterInfo =
+        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo mediaInputshowInputStatusCommandInfo =
         new CommandInfo(
@@ -14819,11 +15897,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             mediaInputshowInputStatusCommandParams);
-    mediaInputClusterCommandInfo.put("showInputStatus", mediaInputshowInputStatusCommandInfo);
+    mediaInputClusterCommandInfoMap.put("showInputStatus", mediaInputshowInputStatusCommandInfo);
     // Populate cluster
     ClusterInfo mediaInputClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             mediaInput_ClusterCommandInfo);
     clusterMap.put("mediaInput", mediaInput_clusterInfo);
@@ -14842,9 +15921,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> mediaPlaybackmediaFastForwardCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            mediaInputClusterCommandInfoMap);
+    clusterMap.put("mediaInput", mediaInputClusterInfo);
+    Map<String, CommandInfo> mediaPlaybackClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> mediaPlaybackmediaFastForwardCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaFastForwardCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaFastForwardCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
@@ -14876,14 +15962,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaFastForwardResponseCallback(),
             mediaPlaybackmediaFastForwardCommandParams);
-    mediaPlaybackClusterCommandInfo.put(
+    mediaPlaybackClusterCommandInfoMap.put(
         "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> mediaPlaybackmediaNextCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> mediaPlaybackmediaNextCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaNextCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaNextCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -14912,13 +16003,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaNextResponseCallback(),
             mediaPlaybackmediaNextCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaPauseCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaPauseCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaPauseCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaPauseCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -14947,13 +16044,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaPauseResponseCallback(),
             mediaPlaybackmediaPauseCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaPlayCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaPlayCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaPlayCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaPlayCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -14982,13 +16085,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaPlayResponseCallback(),
             mediaPlaybackmediaPlayCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaPreviousCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaPreviousCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaPreviousCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaPreviousCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -15017,13 +16126,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaPreviousResponseCallback(),
             mediaPlaybackmediaPreviousCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaRewindCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaRewindCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaRewindCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaRewindCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -15055,14 +16170,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaRewindResponseCallback(),
             mediaPlaybackmediaRewindCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaSeekCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaSeekCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaSeekCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaSeekCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter mediaPlaybackmediaSeekpositionCommandParameter =
         new CommandParameter("position", long.class);
 <<<<<<< HEAD
@@ -15073,6 +16195,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackmediaSeekCommandParams.put(
         "position", mediaPlaybackmediaSeekpositionCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo mediaPlaybackmediaSeekpositionCommandParameterInfo =
+        new CommandParameterInfo("position", long.class);
+    mediaPlaybackmediaSeekCommandParams.put(
+        "position", mediaPlaybackmediaSeekpositionCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo mediaPlaybackmediaSeekCommandInfo =
@@ -15105,25 +16233,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaSeekResponseCallback(),
             mediaPlaybackmediaSeekCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaSkipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaSkipBackwardCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaSkipBackwardCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaSkipBackwardCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
-    CommandParameter mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
+    CommandParameterInfo
+        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo =
+            new CommandParameterInfo("deltaPositionMilliseconds", long.class);
     mediaPlaybackmediaSkipBackwardCommandParams.put(
         "deltaPositionMilliseconds",
+<<<<<<< HEAD
 <<<<<<< HEAD
         mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo mediaPlaybackmediaSkipBackwardCommandInfo =
@@ -15158,26 +16297,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaSkipBackwardResponseCallback(),
             mediaPlaybackmediaSkipBackwardCommandParams);
-    mediaPlaybackClusterCommandInfo.put(
+    mediaPlaybackClusterCommandInfoMap.put(
         "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> mediaPlaybackmediaSkipForwardCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> mediaPlaybackmediaSkipForwardCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaSkipForwardCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaSkipForwardCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
-    CommandParameter mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
+    CommandParameterInfo
+        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo =
+            new CommandParameterInfo("deltaPositionMilliseconds", long.class);
     mediaPlaybackmediaSkipForwardCommandParams.put(
         "deltaPositionMilliseconds",
+<<<<<<< HEAD
 <<<<<<< HEAD
         mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo mediaPlaybackmediaSkipForwardCommandInfo =
@@ -15207,14 +16356,19 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaSkipForwardResponseCallback(),
             mediaPlaybackmediaSkipForwardCommandParams);
-    mediaPlaybackClusterCommandInfo.put(
+    mediaPlaybackClusterCommandInfoMap.put(
         "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> mediaPlaybackmediaStartOverCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> mediaPlaybackmediaStartOverCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaStartOverCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaStartOverCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback",
             ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
@@ -15245,13 +16399,20 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedMediaStartOverResponseCallback(),
             mediaPlaybackmediaStartOverCommandParams);
+<<<<<<< HEAD
     mediaPlaybackClusterCommandInfo.put("mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
     Map<String, CommandParameter> mediaPlaybackmediaStopCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    mediaPlaybackClusterCommandInfoMap.put(
+        "mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
+    Map<String, CommandParameterInfo> mediaPlaybackmediaStopCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter mediaPlaybackmediaStopCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo mediaPlaybackmediaStopCommandParameterInfo =
+        new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -15268,11 +16429,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedMediaStopResponseCallback(),
             mediaPlaybackmediaStopCommandParams);
-    mediaPlaybackClusterCommandInfo.put("mediaStop", mediaPlaybackmediaStopCommandInfo);
+    mediaPlaybackClusterCommandInfoMap.put("mediaStop", mediaPlaybackmediaStopCommandInfo);
     // Populate cluster
     ClusterInfo mediaPlaybackClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             mediaPlayback_ClusterCommandInfo);
     clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
@@ -15305,22 +16467,31 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> networkCommissioningaddThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            mediaPlaybackClusterCommandInfoMap);
+    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
+    Map<String, CommandInfo> networkCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> networkCommissioningaddThreadNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningaddThreadNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningaddThreadNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
-    CommandParameter networkCommissioningaddThreadNetworkoperationalDatasetCommandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
+    CommandParameterInfo
+        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameterInfo =
+            new CommandParameterInfo("operationalDataset", byte[].class);
     networkCommissioningaddThreadNetworkCommandParams.put(
         "operationalDataset",
-        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameter);
+        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameterInfo);
 
-    CommandParameter networkCommissioningaddThreadNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningaddThreadNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningaddThreadNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddThreadNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningaddThreadNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningaddThreadNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15331,6 +16502,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningaddThreadNetworkCommandParams.put(
         "timeoutMs", networkCommissioningaddThreadNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningaddThreadNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningaddThreadNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningaddThreadNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningaddThreadNetworkCommandInfo =
@@ -15381,31 +16558,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedAddThreadNetworkResponseCallback(),
             networkCommissioningaddThreadNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningaddWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningaddWiFiNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningaddWiFiNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningaddWiFiNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
-    CommandParameter networkCommissioningaddWiFiNetworkssidCommandParameter =
-        new CommandParameter("ssid", byte[].class);
+    CommandParameterInfo networkCommissioningaddWiFiNetworkssidCommandParameterInfo =
+        new CommandParameterInfo("ssid", byte[].class);
     networkCommissioningaddWiFiNetworkCommandParams.put(
-        "ssid", networkCommissioningaddWiFiNetworkssidCommandParameter);
+        "ssid", networkCommissioningaddWiFiNetworkssidCommandParameterInfo);
 
-    CommandParameter networkCommissioningaddWiFiNetworkcredentialsCommandParameter =
-        new CommandParameter("credentials", byte[].class);
+    CommandParameterInfo networkCommissioningaddWiFiNetworkcredentialsCommandParameterInfo =
+        new CommandParameterInfo("credentials", byte[].class);
     networkCommissioningaddWiFiNetworkCommandParams.put(
-        "credentials", networkCommissioningaddWiFiNetworkcredentialsCommandParameter);
+        "credentials", networkCommissioningaddWiFiNetworkcredentialsCommandParameterInfo);
 
-    CommandParameter networkCommissioningaddWiFiNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningaddWiFiNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningaddWiFiNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddWiFiNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningaddWiFiNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningaddWiFiNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15416,6 +16599,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningaddWiFiNetworkCommandParams.put(
         "timeoutMs", networkCommissioningaddWiFiNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningaddWiFiNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningaddWiFiNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningaddWiFiNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningaddWiFiNetworkCommandInfo =
@@ -15463,26 +16652,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedAddWiFiNetworkResponseCallback(),
             networkCommissioningaddWiFiNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningdisableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningdisableNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningdisableNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningdisableNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
-    CommandParameter networkCommissioningdisableNetworknetworkIDCommandParameter =
-        new CommandParameter("networkID", byte[].class);
+    CommandParameterInfo networkCommissioningdisableNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class);
     networkCommissioningdisableNetworkCommandParams.put(
-        "networkID", networkCommissioningdisableNetworknetworkIDCommandParameter);
+        "networkID", networkCommissioningdisableNetworknetworkIDCommandParameterInfo);
 
-    CommandParameter networkCommissioningdisableNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningdisableNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningdisableNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningdisableNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningdisableNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningdisableNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15493,6 +16688,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningdisableNetworkCommandParams.put(
         "timeoutMs", networkCommissioningdisableNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningdisableNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningdisableNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningdisableNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningdisableNetworkCommandInfo =
@@ -15536,26 +16737,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedDisableNetworkResponseCallback(),
             networkCommissioningdisableNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningenableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningenableNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningenableNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningenableNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
-    CommandParameter networkCommissioningenableNetworknetworkIDCommandParameter =
-        new CommandParameter("networkID", byte[].class);
+    CommandParameterInfo networkCommissioningenableNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class);
     networkCommissioningenableNetworkCommandParams.put(
-        "networkID", networkCommissioningenableNetworknetworkIDCommandParameter);
+        "networkID", networkCommissioningenableNetworknetworkIDCommandParameterInfo);
 
-    CommandParameter networkCommissioningenableNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningenableNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningenableNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningenableNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningenableNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningenableNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15566,6 +16773,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningenableNetworkCommandParams.put(
         "timeoutMs", networkCommissioningenableNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningenableNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningenableNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningenableNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningenableNetworkCommandInfo =
@@ -15601,26 +16814,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedEnableNetworkResponseCallback(),
             networkCommissioningenableNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "enableNetwork", networkCommissioningenableNetworkCommandInfo);
+<<<<<<< HEAD
 >>>>>>> 41b0956c1 (on/off commands working)
     Map<String, CommandParameter>
+=======
+    Map<String, CommandParameterInfo>
+>>>>>>> fde1d13c0 (fix comments)
         networkCommissioninggetLastNetworkCommissioningResultCommandParams =
-            new LinkedHashMap<String, CommandParameter>();
+            new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter networkCommissioninggetLastNetworkCommissioningResultCommandParameter =
-        new CommandParameter("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameter =
-            new CommandParameter("timeoutMs", long.class);
+    CommandParameterInfo networkCommissioninggetLastNetworkCommissioningResultCommandParameterInfo =
+        new CommandParameterInfo("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo
+        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameterInfo =
+            new CommandParameterInfo("timeoutMs", long.class);
     networkCommissioninggetLastNetworkCommissioningResultCommandParams.put(
         "timeoutMs",
+<<<<<<< HEAD
 <<<<<<< HEAD
         networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioninggetLastNetworkCommissioningResultCommandInfo =
@@ -15636,7 +16857,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             networkCommissioninggetLastNetworkCommissioningResultCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "getLastNetworkCommissioningResult",
 <<<<<<< HEAD
         networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
@@ -15660,24 +16881,30 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
         networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningremoveNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningremoveNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
-    CommandParameter networkCommissioningremoveNetworknetworkIDCommandParameter =
-        new CommandParameter("networkID", byte[].class);
+    CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
+        new CommandParameterInfo("networkID", byte[].class);
     networkCommissioningremoveNetworkCommandParams.put(
-        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameter);
+        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
 
-    CommandParameter networkCommissioningremoveNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningremoveNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningremoveNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15688,6 +16915,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningremoveNetworkCommandParams.put(
         "timeoutMs", networkCommissioningremoveNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningremoveNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningremoveNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningremoveNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningremoveNetworkCommandInfo =
@@ -15731,26 +16964,32 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedRemoveNetworkResponseCallback(),
             networkCommissioningremoveNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningscanNetworksCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningscanNetworksCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
-    CommandParameter networkCommissioningscanNetworksssidCommandParameter =
-        new CommandParameter("ssid", byte[].class);
+    CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
+        new CommandParameterInfo("ssid", byte[].class);
     networkCommissioningscanNetworksCommandParams.put(
-        "ssid", networkCommissioningscanNetworksssidCommandParameter);
+        "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
 
-    CommandParameter networkCommissioningscanNetworksbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningscanNetworksCommandParams.put(
-        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningscanNetworkstimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15761,6 +17000,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningscanNetworksCommandParams.put(
         "timeoutMs", networkCommissioningscanNetworkstimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningscanNetworkstimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningscanNetworksCommandParams.put(
+        "timeoutMs", networkCommissioningscanNetworkstimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningscanNetworksCommandInfo =
@@ -15808,27 +17053,34 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedScanNetworksResponseCallback(),
             networkCommissioningscanNetworksCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "scanNetworks", networkCommissioningscanNetworksCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningupdateThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningupdateThreadNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningupdateThreadNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningupdateThreadNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
-    CommandParameter networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
+    CommandParameterInfo
+        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameterInfo =
+            new CommandParameterInfo("operationalDataset", byte[].class);
     networkCommissioningupdateThreadNetworkCommandParams.put(
         "operationalDataset",
-        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameter);
+        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameterInfo);
 
-    CommandParameter networkCommissioningupdateThreadNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningupdateThreadNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningupdateThreadNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningupdateThreadNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningupdateThreadNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningupdateThreadNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15839,6 +17091,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningupdateThreadNetworkCommandParams.put(
         "timeoutMs", networkCommissioningupdateThreadNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningupdateThreadNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningupdateThreadNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningupdateThreadNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningupdateThreadNetworkCommandInfo =
@@ -15890,31 +17148,37 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedUpdateThreadNetworkResponseCallback(),
             networkCommissioningupdateThreadNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> networkCommissioningupdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> networkCommissioningupdateWiFiNetworkCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter networkCommissioningupdateWiFiNetworkCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo networkCommissioningupdateWiFiNetworkCommandParameterInfo =
+        new CommandParameterInfo(
             "NetworkCommissioning",
             ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
-    CommandParameter networkCommissioningupdateWiFiNetworkssidCommandParameter =
-        new CommandParameter("ssid", byte[].class);
+    CommandParameterInfo networkCommissioningupdateWiFiNetworkssidCommandParameterInfo =
+        new CommandParameterInfo("ssid", byte[].class);
     networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "ssid", networkCommissioningupdateWiFiNetworkssidCommandParameter);
+        "ssid", networkCommissioningupdateWiFiNetworkssidCommandParameterInfo);
 
-    CommandParameter networkCommissioningupdateWiFiNetworkcredentialsCommandParameter =
-        new CommandParameter("credentials", byte[].class);
+    CommandParameterInfo networkCommissioningupdateWiFiNetworkcredentialsCommandParameterInfo =
+        new CommandParameterInfo("credentials", byte[].class);
     networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "credentials", networkCommissioningupdateWiFiNetworkcredentialsCommandParameter);
+        "credentials", networkCommissioningupdateWiFiNetworkcredentialsCommandParameterInfo);
 
-    CommandParameter networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameter =
-        new CommandParameter("breadcrumb", long.class);
+    CommandParameterInfo networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameterInfo =
+        new CommandParameterInfo("breadcrumb", long.class);
     networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameter);
+        "breadcrumb", networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter =
         new CommandParameter("timeoutMs", long.class);
 <<<<<<< HEAD
@@ -15925,6 +17189,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     networkCommissioningupdateWiFiNetworkCommandParams.put(
         "timeoutMs", networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo networkCommissioningupdateWiFiNetworktimeoutMsCommandParameterInfo =
+        new CommandParameterInfo("timeoutMs", long.class);
+    networkCommissioningupdateWiFiNetworkCommandParams.put(
+        "timeoutMs", networkCommissioningupdateWiFiNetworktimeoutMsCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo networkCommissioningupdateWiFiNetworkCommandInfo =
@@ -15945,12 +17215,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedUpdateWiFiNetworkResponseCallback(),
             networkCommissioningupdateWiFiNetworkCommandParams);
-    networkCommissioningClusterCommandInfo.put(
+    networkCommissioningClusterCommandInfoMap.put(
         "updateWiFiNetwork", networkCommissioningupdateWiFiNetworkCommandInfo);
     // Populate cluster
     ClusterInfo networkCommissioningClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             networkCommissioning_ClusterCommandInfo);
     clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
@@ -15979,16 +17250,25 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            networkCommissioningClusterCommandInfoMap);
+    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandParameterInfo =
+        new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
             ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
-    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameter =
-        new CommandParameter("updateToken", byte[].class);
+    CommandParameterInfo
+        otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
+            new CommandParameterInfo("updateToken", byte[].class);
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameter);
+        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter =
         new CommandParameter("newVersion", long.class);
 <<<<<<< HEAD
@@ -15999,6 +17279,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
         "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
+        new CommandParameterInfo("newVersion", long.class);
+    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
+        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo =
@@ -16041,30 +17327,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedApplyUpdateRequestResponseCallback(),
             otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfo.put(
+    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
         "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameterInfo =
+        new CommandParameterInfo(
             "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameter =
-        new CommandParameter("updateToken", byte[].class);
+    CommandParameterInfo
+        otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
+            new CommandParameterInfo("updateToken", byte[].class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
-        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameter);
+        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameter =
-        new CommandParameter("softwareVersion", long.class);
+    CommandParameterInfo
+        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
+            new CommandParameterInfo("softwareVersion", long.class);
     otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
         "softwareVersion",
+<<<<<<< HEAD
 <<<<<<< HEAD
         otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo =
@@ -16130,63 +17427,74 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfo.put(
+    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
         "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateProviderqueryImageCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageCommandParameterInfo =
+        new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
             ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
-    CommandParameter otaSoftwareUpdateProviderqueryImagevendorIdCommandParameter =
-        new CommandParameter("vendorId", int.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
+        new CommandParameterInfo("vendorId", int.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameter);
+        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImageproductIdCommandParameter =
-        new CommandParameter("productId", int.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
+        new CommandParameterInfo("productId", int.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameter);
+        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameter =
-        new CommandParameter("hardwareVersion", int.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
+        new CommandParameterInfo("hardwareVersion", int.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameter);
+        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameter =
-        new CommandParameter("softwareVersion", long.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
+        new CommandParameterInfo("softwareVersion", long.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameter);
+        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameter =
-        new CommandParameter("protocolsSupported", int.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
+        new CommandParameterInfo("protocolsSupported", int.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "protocolsSupported",
-        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameter);
+        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImagelocationCommandParameter =
-        new CommandParameter("location", String.class);
+    CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
+        new CommandParameterInfo("location", String.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameter);
+        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameter =
-        new CommandParameter("requestorCanConsent", boolean.class);
+    CommandParameterInfo
+        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
+            new CommandParameterInfo("requestorCanConsent", boolean.class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "requestorCanConsent",
-        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameter);
+        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameter =
-        new CommandParameter("metadataForProvider", byte[].class);
+    CommandParameterInfo
+        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
+            new CommandParameterInfo("metadataForProvider", byte[].class);
     otaSoftwareUpdateProviderqueryImageCommandParams.put(
         "metadataForProvider",
+<<<<<<< HEAD
 <<<<<<< HEAD
         otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateProviderqueryImageCommandInfo =
@@ -16211,12 +17519,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedQueryImageResponseCallback(),
             otaSoftwareUpdateProviderqueryImageCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfo.put(
+    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
         "queryImage", otaSoftwareUpdateProviderqueryImageCommandInfo);
     // Populate cluster
     ClusterInfo otaSoftwareUpdateProviderClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             otaSoftwareUpdateProvider_ClusterCommandInfo);
     clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
@@ -16255,38 +17564,52 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            otaSoftwareUpdateProviderClusterCommandInfoMap);
+    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
+    Map<String, CommandInfo> otaSoftwareUpdateRequestorClusterCommandInfoMap =
+        new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter otaSoftwareUpdateRequestorannounceOtaProviderCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandParameterInfo =
+        new CommandParameterInfo(
             "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameter =
-        new CommandParameter("providerLocation", byte[].class);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameterInfo =
+            new CommandParameterInfo("providerLocation", byte[].class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "providerLocation",
-        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameter);
+        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameter =
-        new CommandParameter("vendorId", int.class);
+    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
+        new CommandParameterInfo("vendorId", int.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameter);
+        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
 
-    CommandParameter
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameter =
-            new CommandParameter("announcementReason", int.class);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
+            new CommandParameterInfo("announcementReason", int.class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "announcementReason",
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameter);
+        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
 
-    CommandParameter otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameter =
-        new CommandParameter("metadataForNode", byte[].class);
+    CommandParameterInfo
+        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
+            new CommandParameterInfo("metadataForNode", byte[].class);
     otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
         "metadataForNode",
+<<<<<<< HEAD
 <<<<<<< HEAD
         otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo =
@@ -16306,20 +17629,21 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             otaSoftwareUpdateRequestorannounceOtaProviderCommandParams);
-    otaSoftwareUpdateRequestorClusterCommandInfo.put(
+    otaSoftwareUpdateRequestorClusterCommandInfoMap.put(
         "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo);
     // Populate cluster
     ClusterInfo otaSoftwareUpdateRequestorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
-            otaSoftwareUpdateRequestorClusterCommandInfo);
+            otaSoftwareUpdateRequestorClusterCommandInfoMap);
     clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
-    Map<String, CommandInfo> occupancySensingClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> occupancySensingClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo occupancySensingClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             occupancySensing_ClusterCommandInfo);
     clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
@@ -16341,6 +17665,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter onOffoffCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            occupancySensingClusterCommandInfoMap);
+    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
+    Map<String, CommandInfo> onOffClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> onOffoffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo onOffoffCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo onOffoffCommandInfo =
         new CommandInfo(
@@ -16371,17 +17705,24 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             onOffoffCommandParams);
+<<<<<<< HEAD
     onOffClusterCommandInfo.put("off", onOffoffCommandInfo);
     Map<String, CommandParameter> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    onOffClusterCommandInfoMap.put("off", onOffoffCommandInfo);
+    Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter onOffoffWithEffectCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter onOffoffWithEffecteffectIdCommandParameter =
-        new CommandParameter("effectId", int.class);
-    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameter);
+    CommandParameterInfo onOffoffWithEffectCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
+        new CommandParameterInfo("effectId", int.class);
+    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter onOffoffWithEffecteffectVariantCommandParameter =
         new CommandParameter("effectVariant", int.class);
 <<<<<<< HEAD
@@ -16392,6 +17733,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffoffWithEffectCommandParams.put(
         "effectVariant", onOffoffWithEffecteffectVariantCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
+        new CommandParameterInfo("effectVariant", int.class);
+    onOffoffWithEffectCommandParams.put(
+        "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo onOffoffWithEffectCommandInfo =
@@ -16419,6 +17766,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
 =======
             onOffoffWithEffectCommandParams);
+<<<<<<< HEAD
     onOffClusterCommandInfo.put("offWithEffect", onOffoffWithEffectCommandInfo);
     Map<String, CommandParameter> onOffonCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -16427,6 +17775,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter onOffonCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    onOffClusterCommandInfoMap.put("offWithEffect", onOffoffWithEffectCommandInfo);
+    Map<String, CommandParameterInfo> onOffonCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo onOffonCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo onOffonCommandInfo =
         new CommandInfo(
@@ -16450,6 +17806,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             onOffonCommandParams);
+<<<<<<< HEAD
     onOffClusterCommandInfo.put("on", onOffonCommandInfo);
     Map<String, CommandParameter> onOffonWithRecallGlobalSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -16458,6 +17815,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter onOffonWithRecallGlobalSceneCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    onOffClusterCommandInfoMap.put("on", onOffonCommandInfo);
+    Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo onOffonWithRecallGlobalSceneCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo onOffonWithRecallGlobalSceneCommandInfo =
         new CommandInfo(
@@ -16494,22 +17859,30 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             onOffonWithRecallGlobalSceneCommandParams);
+<<<<<<< HEAD
     onOffClusterCommandInfo.put("onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
     Map<String, CommandParameter> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    onOffClusterCommandInfoMap.put(
+        "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
+    Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter onOffonWithTimedOffCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter onOffonWithTimedOffonOffControlCommandParameter =
-        new CommandParameter("onOffControl", int.class);
+    CommandParameterInfo onOffonWithTimedOffCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
+        new CommandParameterInfo("onOffControl", int.class);
     onOffonWithTimedOffCommandParams.put(
-        "onOffControl", onOffonWithTimedOffonOffControlCommandParameter);
+        "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
 
-    CommandParameter onOffonWithTimedOffonTimeCommandParameter =
-        new CommandParameter("onTime", int.class);
-    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameter);
+    CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
+        new CommandParameterInfo("onTime", int.class);
+    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter onOffonWithTimedOffoffWaitTimeCommandParameter =
         new CommandParameter("offWaitTime", int.class);
 <<<<<<< HEAD
@@ -16520,6 +17893,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffonWithTimedOffCommandParams.put(
         "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
+        new CommandParameterInfo("offWaitTime", int.class);
+    onOffonWithTimedOffCommandParams.put(
+        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo onOffonWithTimedOffCommandInfo =
@@ -16549,6 +17928,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             onOffonWithTimedOffCommandParams);
+<<<<<<< HEAD
     onOffClusterCommandInfo.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
     Map<String, CommandParameter> onOfftoggleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -16557,6 +17937,14 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter onOfftoggleCommandParameter =
         new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    onOffClusterCommandInfoMap.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
+    Map<String, CommandParameterInfo> onOfftoggleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo onOfftoggleCommandParameterInfo =
+        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo onOfftoggleCommandInfo =
         new CommandInfo(
@@ -16569,18 +17957,19 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             onOfftoggleCommandParams);
-    onOffClusterCommandInfo.put("toggle", onOfftoggleCommandInfo);
+    onOffClusterCommandInfoMap.put("toggle", onOfftoggleCommandInfo);
     // Populate cluster
     ClusterInfo onOffClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId),
-            onOffClusterCommandInfo);
+            onOffClusterCommandInfoMap);
     clusterMap.put("onOff", onOffClusterInfo);
-    Map<String, CommandInfo> onOffSwitchConfigurationClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> onOffSwitchConfigurationClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo onOffSwitchConfigurationClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             onOffSwitchConfiguration_ClusterCommandInfo);
     clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
@@ -16618,31 +18007,39 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            onOffSwitchConfigurationClusterCommandInfoMap);
+    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
+    Map<String, CommandInfo> operationalCredentialsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsaddNOCCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsaddNOCCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentialsaddNOCNOCValueCommandParameter =
-        new CommandParameter("NOCValue", byte[].class);
+    CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
+        new CommandParameterInfo("NOCValue", byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
-        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameter);
+        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
 
-    CommandParameter operationalCredentialsaddNOCICACValueCommandParameter =
-        new CommandParameter("ICACValue", byte[].class);
+    CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
+        new CommandParameterInfo("ICACValue", byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
-        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameter);
+        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
 
-    CommandParameter operationalCredentialsaddNOCIPKValueCommandParameter =
-        new CommandParameter("IPKValue", byte[].class);
+    CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
+        new CommandParameterInfo("IPKValue", byte[].class);
     operationalCredentialsaddNOCCommandParams.put(
-        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameter);
+        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
 
-    CommandParameter operationalCredentialsaddNOCcaseAdminNodeCommandParameter =
-        new CommandParameter("caseAdminNode", long.class);
+    CommandParameterInfo operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo =
+        new CommandParameterInfo("caseAdminNode", long.class);
     operationalCredentialsaddNOCCommandParams.put(
-        "caseAdminNode", operationalCredentialsaddNOCcaseAdminNodeCommandParameter);
+        "caseAdminNode", operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter operationalCredentialsaddNOCadminVendorIdCommandParameter =
         new CommandParameter("adminVendorId", int.class);
 <<<<<<< HEAD
@@ -16653,6 +18050,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     operationalCredentialsaddNOCCommandParams.put(
         "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
+        new CommandParameterInfo("adminVendorId", int.class);
+    operationalCredentialsaddNOCCommandParams.put(
+        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsaddNOCCommandInfo =
@@ -16691,24 +18094,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedNOCResponseCallback(),
             operationalCredentialsaddNOCCommandParams);
+<<<<<<< HEAD
     operationalCredentialsClusterCommandInfo.put("addNOC", operationalCredentialsaddNOCCommandInfo);
     Map<String, CommandParameter> operationalCredentialsaddTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    operationalCredentialsClusterCommandInfoMap.put(
+        "addNOC", operationalCredentialsaddNOCCommandInfo);
+    Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsaddTrustedRootCertificateCommandParameter =
-        new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameter =
-            new CommandParameter("rootCertificate", byte[].class);
+    CommandParameterInfo operationalCredentialsaddTrustedRootCertificateCommandParameterInfo =
+        new CommandParameterInfo(
+            "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
+            new CommandParameterInfo("rootCertificate", byte[].class);
     operationalCredentialsaddTrustedRootCertificateCommandParams.put(
         "rootCertificate",
+<<<<<<< HEAD
 <<<<<<< HEAD
         operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsaddTrustedRootCertificateCommandInfo =
@@ -16742,26 +18157,36 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             operationalCredentialsaddTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsattestationRequestCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsattestationRequestCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsattestationRequestCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
-    CommandParameter operationalCredentialsattestationRequestattestationNonceCommandParameter =
-        new CommandParameter("attestationNonce", byte[].class);
+    CommandParameterInfo
+        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
+            new CommandParameterInfo("attestationNonce", byte[].class);
     operationalCredentialsattestationRequestCommandParams.put(
         "attestationNonce",
+<<<<<<< HEAD
 <<<<<<< HEAD
         operationalCredentials_attestationRequest_attestationNonce_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         operationalCredentialsattestationRequestattestationNonceCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsattestationRequestCommandInfo =
@@ -16797,26 +18222,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedAttestationResponseCallback(),
             operationalCredentialsattestationRequestCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialscertificateChainRequestCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialscertificateChainRequestCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialscertificateChainRequestCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
-    CommandParameter operationalCredentialscertificateChainRequestcertificateTypeCommandParameter =
-        new CommandParameter("certificateType", int.class);
+    CommandParameterInfo
+        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
+            new CommandParameterInfo("certificateType", int.class);
     operationalCredentialscertificateChainRequestCommandParams.put(
         "certificateType",
+<<<<<<< HEAD
 <<<<<<< HEAD
         operationalCredentials_certificateChainRequest_certificateType_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         operationalCredentialscertificateChainRequestcertificateTypeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialscertificateChainRequestCommandInfo =
@@ -16850,16 +18285,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedCertificateChainResponseCallback(),
             operationalCredentialscertificateChainRequestCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsopCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialsopCSRRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsopCSRRequestCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsopCSRRequestCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter operationalCredentialsopCSRRequestCSRNonceCommandParameter =
         new CommandParameter("CSRNonce", byte[].class);
 <<<<<<< HEAD
@@ -16870,6 +18311,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     operationalCredentialsopCSRRequestCommandParams.put(
         "CSRNonce", operationalCredentialsopCSRRequestCSRNonceCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo operationalCredentialsopCSRRequestCSRNonceCommandParameterInfo =
+        new CommandParameterInfo("CSRNonce", byte[].class);
+    operationalCredentialsopCSRRequestCommandParams.put(
+        "CSRNonce", operationalCredentialsopCSRRequestCSRNonceCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsopCSRRequestCommandInfo =
@@ -16903,16 +18350,22 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedOpCSRResponseCallback(),
             operationalCredentialsopCSRRequestCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsremoveFabricCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsremoveFabricCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter operationalCredentialsremoveFabricfabricIndexCommandParameter =
         new CommandParameter("fabricIndex", int.class);
 <<<<<<< HEAD
@@ -16923,6 +18376,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     operationalCredentialsremoveFabricCommandParams.put(
         "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
+        new CommandParameterInfo("fabricIndex", int.class);
+    operationalCredentialsremoveFabricCommandParams.put(
+        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsremoveFabricCommandInfo =
@@ -16958,25 +18417,36 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedNOCResponseCallback(),
             operationalCredentialsremoveFabricCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "removeFabric", operationalCredentialsremoveFabricCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsremoveTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo>
+        operationalCredentialsremoveTrustedRootCertificateCommandParams =
+            new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsremoveTrustedRootCertificateCommandParameter =
-        new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameter =
-            new CommandParameter("trustedRootIdentifier", byte[].class);
+    CommandParameterInfo operationalCredentialsremoveTrustedRootCertificateCommandParameterInfo =
+        new CommandParameterInfo(
+            "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo
+        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo =
+            new CommandParameterInfo("trustedRootIdentifier", byte[].class);
     operationalCredentialsremoveTrustedRootCertificateCommandParams.put(
         "trustedRootIdentifier",
+<<<<<<< HEAD
 <<<<<<< HEAD
         operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsremoveTrustedRootCertificateCommandInfo =
@@ -16993,7 +18463,7 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             operationalCredentialsremoveTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "removeTrustedRootCertificate",
 <<<<<<< HEAD
         operationalCredentials_removeTrustedRootCertificate_CommandInfo);
@@ -17011,14 +18481,20 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
         operationalCredentialsremoveTrustedRootCertificateCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsupdateFabricLabelCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsupdateFabricLabelCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter operationalCredentialsupdateFabricLabellabelCommandParameter =
         new CommandParameter("label", String.class);
 <<<<<<< HEAD
@@ -17029,6 +18505,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     operationalCredentialsupdateFabricLabelCommandParams.put(
         "label", operationalCredentialsupdateFabricLabellabelCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
+        new CommandParameterInfo("label", String.class);
+    operationalCredentialsupdateFabricLabelCommandParams.put(
+        "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsupdateFabricLabelCommandInfo =
@@ -17065,21 +18547,27 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedNOCResponseCallback(),
             operationalCredentialsupdateFabricLabelCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter operationalCredentialsupdateNOCCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo operationalCredentialsupdateNOCCommandParameterInfo =
+        new CommandParameterInfo(
             "OperationalCredentials",
             ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameter operationalCredentialsupdateNOCNOCValueCommandParameter =
-        new CommandParameter("NOCValue", byte[].class);
+    CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
+        new CommandParameterInfo("NOCValue", byte[].class);
     operationalCredentialsupdateNOCCommandParams.put(
-        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameter);
+        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter operationalCredentialsupdateNOCICACValueCommandParameter =
         new CommandParameter("ICACValue", byte[].class);
 <<<<<<< HEAD
@@ -17090,6 +18578,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     operationalCredentialsupdateNOCCommandParams.put(
         "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
+        new CommandParameterInfo("ICACValue", byte[].class);
+    operationalCredentialsupdateNOCCommandParams.put(
+        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo operationalCredentialsupdateNOCCommandInfo =
@@ -17107,42 +18601,45 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedNOCResponseCallback(),
             operationalCredentialsupdateNOCCommandParams);
-    operationalCredentialsClusterCommandInfo.put(
+    operationalCredentialsClusterCommandInfoMap.put(
         "updateNOC", operationalCredentialsupdateNOCCommandInfo);
     // Populate cluster
     ClusterInfo operationalCredentialsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
-            operationalCredentialsClusterCommandInfo);
+            operationalCredentialsClusterCommandInfoMap);
     clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
-    Map<String, CommandInfo> powerSourceClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> powerSourceClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo powerSourceClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
-            powerSourceClusterCommandInfo);
+            powerSourceClusterCommandInfoMap);
     clusterMap.put("powerSource", powerSourceClusterInfo);
-    Map<String, CommandInfo> pressureMeasurementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> pressureMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo pressureMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId),
-            pressureMeasurementClusterCommandInfo);
+            pressureMeasurementClusterCommandInfoMap);
     clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
-    Map<String, CommandInfo> pumpConfigurationAndControlClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> pumpConfigurationAndControlClusterCommandInfoMap =
+        new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo pumpConfigurationAndControlClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
-            pumpConfigurationAndControlClusterCommandInfo);
+            pumpConfigurationAndControlClusterCommandInfoMap);
     clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
-    Map<String, CommandInfo> relativeHumidityMeasurementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> relativeHumidityMeasurementClusterCommandInfoMap =
+        new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo relativeHumidityMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             relativeHumidityMeasurement_ClusterCommandInfo);
     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
@@ -17184,33 +18681,43 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            relativeHumidityMeasurementClusterCommandInfoMap);
+    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
+    Map<String, CommandInfo> scenesClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesaddSceneCommandParameter =
-        new CommandParameter("Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
-    CommandParameter scenesaddScenegroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameter);
+    CommandParameterInfo scenesaddSceneCommandParameterInfo =
+        new CommandParameterInfo(
+            "Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
+    CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
 
-    CommandParameter scenesaddScenesceneIdCommandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameter);
+    CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", int.class);
+    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
 
-    CommandParameter scenesaddScenetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
-    scenesaddSceneCommandParams.put("transitionTime", scenesaddScenetransitionTimeCommandParameter);
+    CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
+    scenesaddSceneCommandParams.put(
+        "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
 
-    CommandParameter scenesaddScenesceneNameCommandParameter =
-        new CommandParameter("sceneName", String.class);
-    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameter);
+    CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
+        new CommandParameterInfo("sceneName", String.class);
+    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
 
-    CommandParameter scenesaddSceneclusterIdCommandParameter =
-        new CommandParameter("clusterId", long.class);
-    scenesaddSceneCommandParams.put("clusterId", scenesaddSceneclusterIdCommandParameter);
+    CommandParameterInfo scenesaddSceneclusterIdCommandParameterInfo =
+        new CommandParameterInfo("clusterId", long.class);
+    scenesaddSceneCommandParams.put("clusterId", scenesaddSceneclusterIdCommandParameterInfo);
 
-    CommandParameter scenesaddScenelengthCommandParameter =
-        new CommandParameter("length", int.class);
-    scenesaddSceneCommandParams.put("length", scenesaddScenelengthCommandParameter);
+    CommandParameterInfo scenesaddScenelengthCommandParameterInfo =
+        new CommandParameterInfo("length", int.class);
+    scenesaddSceneCommandParams.put("length", scenesaddScenelengthCommandParameterInfo);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     CommandParameter scenes_addScene_value_commandParameter =
         new CommandParameter("value", int.class);
@@ -17220,6 +18727,11 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter scenesaddScenevalueCommandParameter = new CommandParameter("value", int.class);
     scenesaddSceneCommandParams.put("value", scenesaddScenevalueCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesaddScenevalueCommandParameterInfo =
+        new CommandParameterInfo("value", int.class);
+    scenesaddSceneCommandParams.put("value", scenesaddScenevalueCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesaddSceneCommandInfo =
@@ -17257,14 +18769,21 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedAddSceneResponseCallback(),
             scenesaddSceneCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("addScene", scenesaddSceneCommandInfo);
     Map<String, CommandParameter> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("addScene", scenesaddSceneCommandInfo);
+    Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesgetSceneMembershipCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo scenesgetSceneMembershipCommandParameterInfo =
+        new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter scenesgetSceneMembershipgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
 <<<<<<< HEAD
@@ -17275,6 +18794,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesgetSceneMembershipCommandParams.put(
         "groupId", scenesgetSceneMembershipgroupIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesgetSceneMembershipCommandParams.put(
+        "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesgetSceneMembershipCommandInfo =
@@ -17314,21 +18839,28 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedGetSceneMembershipResponseCallback(),
             scenesgetSceneMembershipCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
     Map<String, CommandParameter> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
+    Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesrecallSceneCommandParameter =
-        new CommandParameter("Scenes", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter scenesrecallScenegroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameter);
+    CommandParameterInfo scenesrecallSceneCommandParameterInfo =
+        new CommandParameterInfo("Scenes", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
 
-    CommandParameter scenesrecallScenesceneIdCommandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameter);
+    CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", int.class);
+    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter scenesrecallScenetransitionTimeCommandParameter =
         new CommandParameter("transitionTime", int.class);
 <<<<<<< HEAD
@@ -17339,6 +18871,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesrecallSceneCommandParams.put(
         "transitionTime", scenesrecallScenetransitionTimeCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
+        new CommandParameterInfo("transitionTime", int.class);
+    scenesrecallSceneCommandParams.put(
+        "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesrecallSceneCommandInfo =
@@ -17371,14 +18909,21 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             scenesrecallSceneCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("recallScene", scenesrecallSceneCommandInfo);
     Map<String, CommandParameter> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("recallScene", scenesrecallSceneCommandInfo);
+    Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesremoveAllScenesCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo scenesremoveAllScenesCommandParameterInfo =
+        new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter scenesremoveAllScenesgroupIdCommandParameter =
         new CommandParameter("groupId", int.class);
 <<<<<<< HEAD
@@ -17388,6 +18933,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     scenesremoveAllScenesCommandParams.put("groupId", scenesremoveAllScenesgroupIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesremoveAllScenesCommandParams.put(
+        "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesremoveAllScenesCommandInfo =
@@ -17423,18 +18974,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedRemoveAllScenesResponseCallback(),
             scenesremoveAllScenesCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
     Map<String, CommandParameter> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
+    Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesremoveSceneCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo scenesremoveSceneCommandParameterInfo =
+        new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
-    CommandParameter scenesremoveScenegroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameter);
+    CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter scenesremoveScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
 <<<<<<< HEAD
@@ -17443,6 +19001,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", int.class);
+    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesremoveSceneCommandInfo =
@@ -17479,17 +19042,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedRemoveSceneResponseCallback(),
             scenesremoveSceneCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("removeScene", scenesremoveSceneCommandInfo);
     Map<String, CommandParameter> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("removeScene", scenesremoveSceneCommandInfo);
+    Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesstoreSceneCommandParameter =
-        new CommandParameter("Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
-    CommandParameter scenesstoreScenegroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameter);
+    CommandParameterInfo scenesstoreSceneCommandParameterInfo =
+        new CommandParameterInfo(
+            "Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
+    CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter scenesstoreScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
 <<<<<<< HEAD
@@ -17498,6 +19069,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", int.class);
+    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesstoreSceneCommandInfo =
@@ -17534,17 +19110,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedStoreSceneResponseCallback(),
             scenesstoreSceneCommandParams);
+<<<<<<< HEAD
     scenesClusterCommandInfo.put("storeScene", scenesstoreSceneCommandInfo);
     Map<String, CommandParameter> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    scenesClusterCommandInfoMap.put("storeScene", scenesstoreSceneCommandInfo);
+    Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter scenesviewSceneCommandParameter =
-        new CommandParameter("Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
-    CommandParameter scenesviewScenegroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameter);
+    CommandParameterInfo scenesviewSceneCommandParameterInfo =
+        new CommandParameterInfo(
+            "Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
+    CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
+        new CommandParameterInfo("groupId", int.class);
+    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter scenesviewScenesceneIdCommandParameter =
         new CommandParameter("sceneId", int.class);
 <<<<<<< HEAD
@@ -17553,6 +19137,11 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
+        new CommandParameterInfo("sceneId", int.class);
+    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo scenesviewSceneCommandInfo =
@@ -17570,11 +19159,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedViewSceneResponseCallback(),
             scenesviewSceneCommandParams);
-    scenesClusterCommandInfo.put("viewScene", scenesviewSceneCommandInfo);
+    scenesClusterCommandInfoMap.put("viewScene", scenesviewSceneCommandInfo);
     // Populate cluster
     ClusterInfo scenesClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             scenes_ClusterCommandInfo);
     clusterMap.put("scenes", scenes_clusterInfo);
@@ -17597,6 +19187,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter softwareDiagnosticsresetWatermarksCommandParameter =
         new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            scenesClusterCommandInfoMap);
+    clusterMap.put("scenes", scenesClusterInfo);
+    Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo softwareDiagnosticsresetWatermarksCommandParameterInfo =
+        new CommandParameterInfo("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo softwareDiagnosticsresetWatermarksCommandInfo =
         new CommandInfo(
@@ -17610,19 +19210,20 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             softwareDiagnosticsresetWatermarksCommandParams);
-    softwareDiagnosticsClusterCommandInfo.put(
+    softwareDiagnosticsClusterCommandInfoMap.put(
         "resetWatermarks", softwareDiagnosticsresetWatermarksCommandInfo);
     // Populate cluster
     ClusterInfo softwareDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
-            softwareDiagnosticsClusterCommandInfo);
+            softwareDiagnosticsClusterCommandInfoMap);
     clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
-    Map<String, CommandInfo> switchClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> switchClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo switchClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             switch_ClusterCommandInfo);
     clusterMap.put("switch", switch_clusterInfo);
@@ -17644,10 +19245,18 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> tvChannelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            switchClusterCommandInfoMap);
+    clusterMap.put("switch", switchClusterInfo);
+    Map<String, CommandInfo> tvChannelClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> tvChannelchangeChannelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter tvChannelchangeChannelCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo tvChannelchangeChannelCommandParameterInfo =
+        new CommandParameterInfo(
             "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
+<<<<<<< HEAD
     CommandParameter tvChannelchangeChannelmatchCommandParameter =
         new CommandParameter("match", String.class);
 <<<<<<< HEAD
@@ -17657,6 +19266,12 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     tvChannelchangeChannelCommandParams.put("match", tvChannelchangeChannelmatchCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo tvChannelchangeChannelmatchCommandParameterInfo =
+        new CommandParameterInfo("match", String.class);
+    tvChannelchangeChannelCommandParams.put(
+        "match", tvChannelchangeChannelmatchCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo tvChannelchangeChannelCommandInfo =
@@ -17694,18 +19309,25 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedChangeChannelResponseCallback(),
             tvChannelchangeChannelCommandParams);
+<<<<<<< HEAD
     tvChannelClusterCommandInfo.put("changeChannel", tvChannelchangeChannelCommandInfo);
     Map<String, CommandParameter> tvChannelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    tvChannelClusterCommandInfoMap.put("changeChannel", tvChannelchangeChannelCommandInfo);
+    Map<String, CommandParameterInfo> tvChannelchangeChannelByNumberCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter tvChannelchangeChannelByNumberCommandParameter =
-        new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter tvChannelchangeChannelByNumbermajorNumberCommandParameter =
-        new CommandParameter("majorNumber", int.class);
+    CommandParameterInfo tvChannelchangeChannelByNumberCommandParameterInfo =
+        new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo =
+        new CommandParameterInfo("majorNumber", int.class);
     tvChannelchangeChannelByNumberCommandParams.put(
-        "majorNumber", tvChannelchangeChannelByNumbermajorNumberCommandParameter);
+        "majorNumber", tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter tvChannelchangeChannelByNumberminorNumberCommandParameter =
         new CommandParameter("minorNumber", int.class);
 <<<<<<< HEAD
@@ -17716,6 +19338,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     tvChannelchangeChannelByNumberCommandParams.put(
         "minorNumber", tvChannelchangeChannelByNumberminorNumberCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo tvChannelchangeChannelByNumberminorNumberCommandParameterInfo =
+        new CommandParameterInfo("minorNumber", int.class);
+    tvChannelchangeChannelByNumberCommandParams.put(
+        "minorNumber", tvChannelchangeChannelByNumberminorNumberCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo tvChannelchangeChannelByNumberCommandInfo =
@@ -17747,8 +19375,9 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             tvChannelchangeChannelByNumberCommandParams);
-    tvChannelClusterCommandInfo.put(
+    tvChannelClusterCommandInfoMap.put(
         "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> tvChannelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -17763,6 +19392,16 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
     tvChannelskipChannelCommandParams.put("count", tvChannelskipChannelcountCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> tvChannelskipChannelCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo tvChannelskipChannelCommandParameterInfo =
+        new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo tvChannelskipChannelcountCommandParameterInfo =
+        new CommandParameterInfo("count", int.class);
+    tvChannelskipChannelCommandParams.put("count", tvChannelskipChannelcountCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo tvChannelskipChannelCommandInfo =
@@ -17778,11 +19417,12 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             tvChannelskipChannelCommandParams);
-    tvChannelClusterCommandInfo.put("skipChannel", tvChannelskipChannelCommandInfo);
+    tvChannelClusterCommandInfoMap.put("skipChannel", tvChannelskipChannelCommandInfo);
     // Populate cluster
     ClusterInfo tvChannelClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             tvChannel_ClusterCommandInfo);
     clusterMap.put("tvChannel", tvChannel_clusterInfo);
@@ -17808,16 +19448,24 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameter> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+            tvChannelClusterCommandInfoMap);
+    clusterMap.put("tvChannel", tvChannelClusterInfo);
+    Map<String, CommandInfo> targetNavigatorClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter targetNavigatornavigateTargetCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo targetNavigatornavigateTargetCommandParameterInfo =
+        new CommandParameterInfo(
             "TargetNavigator",
             ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
-    CommandParameter targetNavigatornavigateTargettargetCommandParameter =
-        new CommandParameter("target", int.class);
+    CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
+        new CommandParameterInfo("target", int.class);
     targetNavigatornavigateTargetCommandParams.put(
-        "target", targetNavigatornavigateTargettargetCommandParameter);
+        "target", targetNavigatornavigateTargettargetCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter targetNavigatornavigateTargetdataCommandParameter =
         new CommandParameter("data", String.class);
 <<<<<<< HEAD
@@ -17828,6 +19476,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     targetNavigatornavigateTargetCommandParams.put(
         "data", targetNavigatornavigateTargetdataCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
+        new CommandParameterInfo("data", String.class);
+    targetNavigatornavigateTargetCommandParams.put(
+        "data", targetNavigatornavigateTargetdataCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo targetNavigatornavigateTargetCommandInfo =
@@ -17845,19 +19499,20 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedNavigateTargetResponseCallback(),
             targetNavigatornavigateTargetCommandParams);
-    targetNavigatorClusterCommandInfo.put(
+    targetNavigatorClusterCommandInfoMap.put(
         "navigateTarget", targetNavigatornavigateTargetCommandInfo);
     // Populate cluster
     ClusterInfo targetNavigatorClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId),
-            targetNavigatorClusterCommandInfo);
+            targetNavigatorClusterCommandInfoMap);
     clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
-    Map<String, CommandInfo> temperatureMeasurementClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> temperatureMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo temperatureMeasurementClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             temperatureMeasurement_ClusterCommandInfo);
     clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
@@ -17880,6 +19535,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter testClustertestCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            temperatureMeasurementClusterCommandInfoMap);
+    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
+    Map<String, CommandInfo> testClusterClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> testClustertestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo testClustertestCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo testClustertestCommandInfo =
         new CommandInfo(
@@ -17910,19 +19575,26 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             testClustertestCommandParams);
+<<<<<<< HEAD
     testClusterClusterCommandInfo.put("test", testClustertestCommandInfo);
     Map<String, CommandParameter> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    testClusterClusterCommandInfoMap.put("test", testClustertestCommandInfo);
+    Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter testClustertestAddArgumentsCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo testClustertestAddArgumentsCommandParameterInfo =
+        new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
-    CommandParameter testClustertestAddArgumentsarg1CommandParameter =
-        new CommandParameter("arg1", int.class);
+    CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", int.class);
     testClustertestAddArgumentsCommandParams.put(
-        "arg1", testClustertestAddArgumentsarg1CommandParameter);
+        "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter testClustertestAddArgumentsarg2CommandParameter =
         new CommandParameter("arg2", int.class);
 <<<<<<< HEAD
@@ -17933,6 +19605,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClustertestAddArgumentsCommandParams.put(
         "arg2", testClustertestAddArgumentsarg2CommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
+        new CommandParameterInfo("arg2", int.class);
+    testClustertestAddArgumentsCommandParams.put(
+        "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo testClustertestAddArgumentsCommandInfo =
@@ -17963,16 +19641,17 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedTestAddArgumentsResponseCallback(),
             testClustertestAddArgumentsCommandParams);
-    testClusterClusterCommandInfo.put("testAddArguments", testClustertestAddArgumentsCommandInfo);
-    Map<String, CommandParameter> testClustertestListInt8UArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
+    testClusterClusterCommandInfoMap.put(
+        "testAddArguments", testClustertestAddArgumentsCommandInfo);
+    Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter testClustertestListInt8UArgumentRequestCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter testClustertestListInt8UArgumentRequestarg1CommandParameter =
-        new CommandParameter("arg1", int.class);
+    CommandParameterInfo testClustertestListInt8UArgumentRequestCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", int.class);
     testClustertestListInt8UArgumentRequestCommandParams.put(
-        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameter);
+        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
 
     // Populate commands
     CommandInfo testClustertestListInt8UArgumentRequestCommandInfo =
@@ -17984,42 +19663,42 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             testClustertestListInt8UArgumentRequestCommandParams);
-    testClusterClusterCommandInfo.put(
+    testClusterClusterCommandInfoMap.put(
         "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
-    Map<String, CommandParameter> testClustertestListStructArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
+    Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter testClustertestListStructArgumentRequestCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter testClustertestListStructArgumentRequestaCommandParameter =
-        new CommandParameter("a", int.class);
+    CommandParameterInfo testClustertestListStructArgumentRequestCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
+        new CommandParameterInfo("a", int.class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "a", testClustertestListStructArgumentRequestaCommandParameter);
+        "a", testClustertestListStructArgumentRequestaCommandParameterInfo);
 
-    CommandParameter testClustertestListStructArgumentRequestbCommandParameter =
-        new CommandParameter("b", boolean.class);
+    CommandParameterInfo testClustertestListStructArgumentRequestbCommandParameterInfo =
+        new CommandParameterInfo("b", boolean.class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "b", testClustertestListStructArgumentRequestbCommandParameter);
+        "b", testClustertestListStructArgumentRequestbCommandParameterInfo);
 
-    CommandParameter testClustertestListStructArgumentRequestcCommandParameter =
-        new CommandParameter("c", int.class);
+    CommandParameterInfo testClustertestListStructArgumentRequestcCommandParameterInfo =
+        new CommandParameterInfo("c", int.class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "c", testClustertestListStructArgumentRequestcCommandParameter);
+        "c", testClustertestListStructArgumentRequestcCommandParameterInfo);
 
-    CommandParameter testClustertestListStructArgumentRequestdCommandParameter =
-        new CommandParameter("d", byte[].class);
+    CommandParameterInfo testClustertestListStructArgumentRequestdCommandParameterInfo =
+        new CommandParameterInfo("d", byte[].class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "d", testClustertestListStructArgumentRequestdCommandParameter);
+        "d", testClustertestListStructArgumentRequestdCommandParameterInfo);
 
-    CommandParameter testClustertestListStructArgumentRequesteCommandParameter =
-        new CommandParameter("e", String.class);
+    CommandParameterInfo testClustertestListStructArgumentRequesteCommandParameterInfo =
+        new CommandParameterInfo("e", String.class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "e", testClustertestListStructArgumentRequesteCommandParameter);
+        "e", testClustertestListStructArgumentRequesteCommandParameterInfo);
 
-    CommandParameter testClustertestListStructArgumentRequestfCommandParameter =
-        new CommandParameter("f", int.class);
+    CommandParameterInfo testClustertestListStructArgumentRequestfCommandParameterInfo =
+        new CommandParameterInfo("f", int.class);
     testClustertestListStructArgumentRequestCommandParams.put(
-        "f", testClustertestListStructArgumentRequestfCommandParameter);
+        "f", testClustertestListStructArgumentRequestfCommandParameterInfo);
 
     // Populate commands
     CommandInfo testClustertestListStructArgumentRequestCommandInfo =
@@ -18037,8 +19716,9 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             testClustertestListStructArgumentRequestCommandParams);
-    testClusterClusterCommandInfo.put(
+    testClusterClusterCommandInfoMap.put(
         "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -18046,6 +19726,13 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter testClustertestNotHandledCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo testClustertestNotHandledCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo testClustertestNotHandledCommandInfo =
         new CommandInfo(
@@ -18070,13 +19757,19 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             testClustertestNotHandledCommandParams);
+<<<<<<< HEAD
     testClusterClusterCommandInfo.put("testNotHandled", testClustertestNotHandledCommandInfo);
     Map<String, CommandParameter> testClustertestSpecificCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    testClusterClusterCommandInfoMap.put("testNotHandled", testClustertestNotHandledCommandInfo);
+    Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter testClustertestSpecificCommandParameter =
-        new CommandParameter(
+    CommandParameterInfo testClustertestSpecificCommandParameterInfo =
+        new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -18105,41 +19798,41 @@ public Map<String, ClusterInfo> getClusterMap() {
 =======
             () -> new DelegatedTestSpecificResponseCallback(),
             testClustertestSpecificCommandParams);
-    testClusterClusterCommandInfo.put("testSpecific", testClustertestSpecificCommandInfo);
-    Map<String, CommandParameter> testClustertestStructArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
+    testClusterClusterCommandInfoMap.put("testSpecific", testClustertestSpecificCommandInfo);
+    Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
-    CommandParameter testClustertestStructArgumentRequestCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter testClustertestStructArgumentRequestaCommandParameter =
-        new CommandParameter("a", int.class);
+    CommandParameterInfo testClustertestStructArgumentRequestCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo testClustertestStructArgumentRequestaCommandParameterInfo =
+        new CommandParameterInfo("a", int.class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "a", testClustertestStructArgumentRequestaCommandParameter);
+        "a", testClustertestStructArgumentRequestaCommandParameterInfo);
 
-    CommandParameter testClustertestStructArgumentRequestbCommandParameter =
-        new CommandParameter("b", boolean.class);
+    CommandParameterInfo testClustertestStructArgumentRequestbCommandParameterInfo =
+        new CommandParameterInfo("b", boolean.class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "b", testClustertestStructArgumentRequestbCommandParameter);
+        "b", testClustertestStructArgumentRequestbCommandParameterInfo);
 
-    CommandParameter testClustertestStructArgumentRequestcCommandParameter =
-        new CommandParameter("c", int.class);
+    CommandParameterInfo testClustertestStructArgumentRequestcCommandParameterInfo =
+        new CommandParameterInfo("c", int.class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "c", testClustertestStructArgumentRequestcCommandParameter);
+        "c", testClustertestStructArgumentRequestcCommandParameterInfo);
 
-    CommandParameter testClustertestStructArgumentRequestdCommandParameter =
-        new CommandParameter("d", byte[].class);
+    CommandParameterInfo testClustertestStructArgumentRequestdCommandParameterInfo =
+        new CommandParameterInfo("d", byte[].class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "d", testClustertestStructArgumentRequestdCommandParameter);
+        "d", testClustertestStructArgumentRequestdCommandParameterInfo);
 
-    CommandParameter testClustertestStructArgumentRequesteCommandParameter =
-        new CommandParameter("e", String.class);
+    CommandParameterInfo testClustertestStructArgumentRequesteCommandParameterInfo =
+        new CommandParameterInfo("e", String.class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "e", testClustertestStructArgumentRequesteCommandParameter);
+        "e", testClustertestStructArgumentRequesteCommandParameterInfo);
 
-    CommandParameter testClustertestStructArgumentRequestfCommandParameter =
-        new CommandParameter("f", int.class);
+    CommandParameterInfo testClustertestStructArgumentRequestfCommandParameterInfo =
+        new CommandParameterInfo("f", int.class);
     testClustertestStructArgumentRequestCommandParams.put(
-        "f", testClustertestStructArgumentRequestfCommandParameter);
+        "f", testClustertestStructArgumentRequestfCommandParameterInfo);
 
     // Populate commands
     CommandInfo testClustertestStructArgumentRequestCommandInfo =
@@ -18157,8 +19850,9 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             testClustertestStructArgumentRequestCommandParams);
-    testClusterClusterCommandInfo.put(
+    testClusterClusterCommandInfoMap.put(
         "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -18166,6 +19860,13 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter testClustertestUnknownCommandCommandParameter =
         new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo testClustertestUnknownCommandCommandParameterInfo =
+        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo testClustertestUnknownCommandCommandInfo =
         new CommandInfo(
@@ -18179,12 +19880,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             testClustertestUnknownCommandCommandParams);
-    testClusterClusterCommandInfo.put(
+    testClusterClusterCommandInfoMap.put(
         "testUnknownCommand", testClustertestUnknownCommandCommandInfo);
     // Populate cluster
     ClusterInfo testClusterClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             testCluster_ClusterCommandInfo);
     clusterMap.put("testCluster", testCluster_clusterInfo);
@@ -18207,6 +19909,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter thermostatclearWeeklyScheduleCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            testClusterClusterCommandInfoMap);
+    clusterMap.put("testCluster", testClusterClusterInfo);
+    Map<String, CommandInfo> thermostatClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo thermostatclearWeeklyScheduleCommandParameterInfo =
+        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo thermostatclearWeeklyScheduleCommandInfo =
         new CommandInfo(
@@ -18232,8 +19944,9 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             thermostatclearWeeklyScheduleCommandParams);
-    thermostatClusterCommandInfo.put(
+    thermostatClusterCommandInfoMap.put(
         "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> thermostatgetRelayStatusLogCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -18241,6 +19954,13 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter thermostatgetRelayStatusLogCommandParameter =
         new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo thermostatgetRelayStatusLogCommandParameterInfo =
+        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo thermostatgetRelayStatusLogCommandInfo =
         new CommandInfo(
@@ -18273,18 +19993,26 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             thermostatgetRelayStatusLogCommandParams);
+<<<<<<< HEAD
     thermostatClusterCommandInfo.put("getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
     Map<String, CommandParameter> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    thermostatClusterCommandInfoMap.put(
+        "getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
+    Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter thermostatgetWeeklyScheduleCommandParameter =
-        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostatgetWeeklyScheduledaysToReturnCommandParameter =
-        new CommandParameter("daysToReturn", int.class);
+    CommandParameterInfo thermostatgetWeeklyScheduleCommandParameterInfo =
+        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
+        new CommandParameterInfo("daysToReturn", int.class);
     thermostatgetWeeklyScheduleCommandParams.put(
-        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameter);
+        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter thermostatgetWeeklySchedulemodeToReturnCommandParameter =
         new CommandParameter("modeToReturn", int.class);
 <<<<<<< HEAD
@@ -18295,6 +20023,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     thermostatgetWeeklyScheduleCommandParams.put(
         "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
+        new CommandParameterInfo("modeToReturn", int.class);
+    thermostatgetWeeklyScheduleCommandParams.put(
+        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo thermostatgetWeeklyScheduleCommandInfo =
@@ -18342,29 +20076,39 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             thermostatgetWeeklyScheduleCommandParams);
+<<<<<<< HEAD
     thermostatClusterCommandInfo.put("getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
     Map<String, CommandParameter> thermostatsetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    thermostatClusterCommandInfoMap.put(
+        "getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
+    Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter thermostatsetWeeklyScheduleCommandParameter =
-        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameter =
-        new CommandParameter("numberOfTransitionsForSequence", int.class);
+    CommandParameterInfo thermostatsetWeeklyScheduleCommandParameterInfo =
+        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo
+        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
+            new CommandParameterInfo("numberOfTransitionsForSequence", int.class);
     thermostatsetWeeklyScheduleCommandParams.put(
         "numberOfTransitionsForSequence",
-        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameter);
+        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
 
-    CommandParameter thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameter =
-        new CommandParameter("dayOfWeekForSequence", int.class);
+    CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
+        new CommandParameterInfo("dayOfWeekForSequence", int.class);
     thermostatsetWeeklyScheduleCommandParams.put(
-        "dayOfWeekForSequence", thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameter);
+        "dayOfWeekForSequence",
+        thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
 
-    CommandParameter thermostatsetWeeklySchedulemodeForSequenceCommandParameter =
-        new CommandParameter("modeForSequence", int.class);
+    CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
+        new CommandParameterInfo("modeForSequence", int.class);
     thermostatsetWeeklyScheduleCommandParams.put(
-        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameter);
+        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter thermostatsetWeeklySchedulepayloadCommandParameter =
         new CommandParameter("payload", int.class);
 <<<<<<< HEAD
@@ -18375,6 +20119,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     thermostatsetWeeklyScheduleCommandParams.put(
         "payload", thermostatsetWeeklySchedulepayloadCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo thermostatsetWeeklySchedulepayloadCommandParameterInfo =
+        new CommandParameterInfo("payload", int.class);
+    thermostatsetWeeklyScheduleCommandParams.put(
+        "payload", thermostatsetWeeklySchedulepayloadCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo thermostatsetWeeklyScheduleCommandInfo =
@@ -18413,18 +20163,26 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             thermostatsetWeeklyScheduleCommandParams);
+<<<<<<< HEAD
     thermostatClusterCommandInfo.put("setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
     Map<String, CommandParameter> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    thermostatClusterCommandInfoMap.put(
+        "setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
+    Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter thermostatsetpointRaiseLowerCommandParameter =
-        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter thermostatsetpointRaiseLowermodeCommandParameter =
-        new CommandParameter("mode", int.class);
+    CommandParameterInfo thermostatsetpointRaiseLowerCommandParameterInfo =
+        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
+        new CommandParameterInfo("mode", int.class);
     thermostatsetpointRaiseLowerCommandParams.put(
-        "mode", thermostatsetpointRaiseLowermodeCommandParameter);
+        "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
 
+<<<<<<< HEAD
     CommandParameter thermostatsetpointRaiseLoweramountCommandParameter =
         new CommandParameter("amount", int.class);
 <<<<<<< HEAD
@@ -18435,6 +20193,12 @@ public Map<String, ClusterInfo> getClusterMap() {
     thermostatsetpointRaiseLowerCommandParams.put(
         "amount", thermostatsetpointRaiseLoweramountCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
+        new CommandParameterInfo("amount", int.class);
+    thermostatsetpointRaiseLowerCommandParams.put(
+        "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo thermostatsetpointRaiseLowerCommandInfo =
@@ -18452,21 +20216,22 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             thermostatsetpointRaiseLowerCommandParams);
-    thermostatClusterCommandInfo.put("setpointRaiseLower", thermostatsetpointRaiseLowerCommandInfo);
+    thermostatClusterCommandInfoMap.put(
+        "setpointRaiseLower", thermostatsetpointRaiseLowerCommandInfo);
     // Populate cluster
     ClusterInfo thermostatClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
-            thermostatClusterCommandInfo);
+            thermostatClusterCommandInfoMap);
     clusterMap.put("thermostat", thermostatClusterInfo);
-    Map<String, CommandInfo> thermostatUserInterfaceConfigurationClusterCommandInfo =
+    Map<String, CommandInfo> thermostatUserInterfaceConfigurationClusterCommandInfoMap =
         new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo thermostatUserInterfaceConfigurationClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) ->
                 new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
-            thermostatUserInterfaceConfigurationClusterCommandInfo);
+            thermostatUserInterfaceConfigurationClusterCommandInfoMap);
     clusterMap.put(
 <<<<<<< HEAD
         "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
@@ -18480,6 +20245,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
         "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
+<<<<<<< HEAD
     Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
     Map<String, CommandParameter> threadNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -18488,6 +20254,15 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter threadNetworkDiagnosticsresetCountsCommandParameter =
         new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo threadNetworkDiagnosticsresetCountsCommandParameterInfo =
+        new CommandParameterInfo(
+            "ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo threadNetworkDiagnosticsresetCountsCommandInfo =
         new CommandInfo(
@@ -18501,19 +20276,20 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             threadNetworkDiagnosticsresetCountsCommandParams);
-    threadNetworkDiagnosticsClusterCommandInfo.put(
+    threadNetworkDiagnosticsClusterCommandInfoMap.put(
         "resetCounts", threadNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
     ClusterInfo threadNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
-            threadNetworkDiagnosticsClusterCommandInfo);
+            threadNetworkDiagnosticsClusterCommandInfoMap);
     clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> wakeOnLanClusterCommandInfo = new LinkedHashMap<>();
+    Map<String, CommandInfo> wakeOnLanClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo wakeOnLanClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             wakeOnLan_ClusterCommandInfo);
     clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
@@ -18536,6 +20312,17 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter wiFiNetworkDiagnosticsresetCountsCommandParameter =
         new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            wakeOnLanClusterCommandInfoMap);
+    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
+    Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo wiFiNetworkDiagnosticsresetCountsCommandParameterInfo =
+        new CommandParameterInfo(
+            "WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo wiFiNetworkDiagnosticsresetCountsCommandInfo =
         new CommandInfo(
@@ -18549,12 +20336,13 @@ public Map<String, ClusterInfo> getClusterMap() {
             },
             () -> new DelegatedDefaultClusterCallback(),
             wiFiNetworkDiagnosticsresetCountsCommandParams);
-    wiFiNetworkDiagnosticsClusterCommandInfo.put(
+    wiFiNetworkDiagnosticsClusterCommandInfoMap.put(
         "resetCounts", wiFiNetworkDiagnosticsresetCountsCommandInfo);
     // Populate cluster
     ClusterInfo wiFiNetworkDiagnosticsClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
+<<<<<<< HEAD
 <<<<<<< HEAD
             wiFiNetworkDiagnostics_ClusterCommandInfo);
     clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
@@ -18577,6 +20365,16 @@ public Map<String, ClusterInfo> getClusterMap() {
     CommandParameter windowCoveringdownOrCloseCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+            wiFiNetworkDiagnosticsClusterCommandInfoMap);
+    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
+    Map<String, CommandInfo> windowCoveringClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo windowCoveringdownOrCloseCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo windowCoveringdownOrCloseCommandInfo =
         new CommandInfo(
@@ -18610,28 +20408,40 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringdownOrCloseCommandParams);
+<<<<<<< HEAD
     windowCoveringClusterCommandInfo.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
     Map<String, CommandParameter> windowCoveringgoToLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    windowCoveringClusterCommandInfoMap.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter windowCoveringgoToLiftPercentageCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCoveringgoToLiftPercentageliftPercentageValueCommandParameter =
-        new CommandParameter("liftPercentageValue", int.class);
+    CommandParameterInfo windowCoveringgoToLiftPercentageCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo =
+        new CommandParameterInfo("liftPercentageValue", int.class);
     windowCoveringgoToLiftPercentageCommandParams.put(
-        "liftPercentageValue", windowCoveringgoToLiftPercentageliftPercentageValueCommandParameter);
+        "liftPercentageValue",
+        windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo);
 
-    CommandParameter windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameter =
-        new CommandParameter("liftPercent100thsValue", int.class);
+    CommandParameterInfo
+        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
+            new CommandParameterInfo("liftPercent100thsValue", int.class);
     windowCoveringgoToLiftPercentageCommandParams.put(
         "liftPercent100thsValue",
+<<<<<<< HEAD
 <<<<<<< HEAD
         windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo windowCoveringgoToLiftPercentageCommandInfo =
@@ -18664,8 +20474,9 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringgoToLiftPercentageCommandParams);
-    windowCoveringClusterCommandInfo.put(
+    windowCoveringClusterCommandInfoMap.put(
         "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
@@ -18682,6 +20493,17 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringgoToLiftValueCommandParams.put(
         "liftValue", windowCoveringgoToLiftValueliftValueCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo windowCoveringgoToLiftValueCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
+        new CommandParameterInfo("liftValue", int.class);
+    windowCoveringgoToLiftValueCommandParams.put(
+        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo windowCoveringgoToLiftValueCommandInfo =
@@ -18719,28 +20541,41 @@ public Map<String, ClusterInfo> getClusterMap() {
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringgoToLiftValueCommandParams);
+<<<<<<< HEAD
     windowCoveringClusterCommandInfo.put("goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
     Map<String, CommandParameter> windowCoveringgoToTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    windowCoveringClusterCommandInfoMap.put(
+        "goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter windowCoveringgoToTiltPercentageCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameter =
-        new CommandParameter("tiltPercentageValue", int.class);
+    CommandParameterInfo windowCoveringgoToTiltPercentageCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo =
+        new CommandParameterInfo("tiltPercentageValue", int.class);
     windowCoveringgoToTiltPercentageCommandParams.put(
-        "tiltPercentageValue", windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameter);
+        "tiltPercentageValue",
+        windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo);
 
-    CommandParameter windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameter =
-        new CommandParameter("tiltPercent100thsValue", int.class);
+    CommandParameterInfo
+        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
+            new CommandParameterInfo("tiltPercent100thsValue", int.class);
     windowCoveringgoToTiltPercentageCommandParams.put(
         "tiltPercent100thsValue",
+<<<<<<< HEAD
 <<<<<<< HEAD
         windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
 >>>>>>> 677ef48a5 (callback generation done)
 =======
         windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameter);
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
+>>>>>>> fde1d13c0 (fix comments)
 
     // Populate commands
     CommandInfo windowCoveringgoToTiltPercentageCommandInfo =
@@ -18794,18 +20629,23 @@ >>>>>>> a4fd0282e (no error code generation)
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringgoToTiltPercentageCommandParams);
-    windowCoveringClusterCommandInfo.put(
+    windowCoveringClusterCommandInfoMap.put(
         "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
+<<<<<<< HEAD
     Map<String, CommandParameter> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameter>();
 >>>>>>> 41b0956c1 (on/off commands working)
+=======
+    Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+>>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
-    CommandParameter windowCoveringgoToTiltValueCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCoveringgoToTiltValuetiltValueCommandParameter =
-        new CommandParameter("tiltValue", int.class);
+    CommandParameterInfo windowCoveringgoToTiltValueCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
+        new CommandParameterInfo("tiltValue", int.class);
     windowCoveringgoToTiltValueCommandParams.put(
-        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameter);
+        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
 
 >>>>>>> 677ef48a5 (callback generation done)
     // Populate commands
@@ -18835,6 +20675,7 @@ >>>>>>> a4fd0282e (no error code generation)
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringgoToTiltValueCommandParams);
+<<<<<<< HEAD
     windowCoveringClusterCommandInfo.put("goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
     Map<String, CommandParameter> windowCoveringstopMotionCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -18843,6 +20684,15 @@ >>>>>>> a4fd0282e (no error code generation)
     CommandParameter windowCoveringstopMotionCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    windowCoveringClusterCommandInfoMap.put(
+        "goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
+    Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo windowCoveringstopMotionCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo windowCoveringstopMotionCommandInfo =
         new CommandInfo(
@@ -18867,6 +20717,7 @@ >>>>>>> a4fd0282e (no error code generation)
         new HashMap<String, CommandParameter>();
 =======
             windowCoveringstopMotionCommandParams);
+<<<<<<< HEAD
     windowCoveringClusterCommandInfo.put("stopMotion", windowCoveringstopMotionCommandInfo);
     Map<String, CommandParameter> windowCoveringupOrOpenCommandParams =
         new LinkedHashMap<String, CommandParameter>();
@@ -18875,6 +20726,14 @@ >>>>>>> a4fd0282e (no error code generation)
     CommandParameter windowCoveringupOrOpenCommandParameter =
         new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+    windowCoveringClusterCommandInfoMap.put("stopMotion", windowCoveringstopMotionCommandInfo);
+    Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo windowCoveringupOrOpenCommandParameterInfo =
+        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
+>>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo windowCoveringupOrOpenCommandInfo =
         new CommandInfo(
@@ -18888,12 +20747,12 @@ >>>>>>> a4fd0282e (no error code generation)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCoveringupOrOpenCommandParams);
-    windowCoveringClusterCommandInfo.put("upOrOpen", windowCoveringupOrOpenCommandInfo);
+    windowCoveringClusterCommandInfoMap.put("upOrOpen", windowCoveringupOrOpenCommandInfo);
     // Populate cluster
     ClusterInfo windowCoveringClusterInfo =
         new ClusterInfo(
             (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
-            windowCoveringClusterCommandInfo);
+            windowCoveringClusterCommandInfoMap);
     clusterMap.put("windowCovering", windowCoveringClusterInfo);
     return clusterMap;
 <<<<<<< HEAD

From 4f10303ea52c37ce15109e02d95db0823af38e45 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Tue, 19 Oct 2021 21:27:37 +0000
Subject: [PATCH 18/38] Restyled by gn

---
 src/controller/java/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index ff108374892205..4908f7f65effd9 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -107,7 +107,7 @@ java_library("cluster_info") {
     "src/chip/clusterinfo/CommandParameterInfo.java",
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
-    ]
+  ]
 }
 
 java_prebuilt("android") {

From 4f0aab519b7ab46dae0718ecb64e8bd0c4b95423 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Tue, 19 Oct 2021 22:03:16 -0400
Subject: [PATCH 19/38] resolve type, nullable and format comments

---
 .../ClusterInteractionFragment.kt             |   3 +
 .../clusterinfo/ClusterCommandCallback.java   |   3 +
 .../src/chip/clusterinfo/ClusterInfo.java     |   4 +
 .../java/templates/ClusterInfo-java.zapt      | 108 +++++++++---------
 .../devicecontroller/ClusterInfoMapping.java  |   3 +-
 5 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
index abba4faf5c447d..21e7767efa919e 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
@@ -88,6 +88,7 @@ class ClusterInteractionFragment : Fragment() {
       }
 
       override fun onFailure(exception: Exception) {
+<<<<<<< HEAD
         showMessage("Command failed")
         Log.e(TAG, exception.toString())
       }
@@ -143,6 +144,8 @@ class ClusterInteractionFragment : Fragment() {
       }
 
       override fun onFailure(exception: Exception?) {
+=======
+>>>>>>> ef97f0702 (resolve type, nullable and format comments)
         showMessage("Command failed")
         Log.e(TAG, exception.toString())
       }
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index 4e36d3006eb550..b3068eef0dd75b 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -3,6 +3,7 @@
 <<<<<<< HEAD
 
 import java.util.List;
+<<<<<<< HEAD
 
 /**
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
@@ -12,6 +13,8 @@
 
 >>>>>>> 46c963914 (Restyled by google-java-format)
 import java.util.*;
+=======
+>>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
 >>>>>>> 2d2bbd2e1 (new design solution)
 public interface ClusterCommandCallback {
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index a614f974871f2f..fd330a4768679f 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -8,8 +8,12 @@
 import java.util.Map;
 =======
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
+<<<<<<< HEAD
 import java.util.*;
 >>>>>>> 46c963914 (Restyled by google-java-format)
+=======
+import java.util.Map;
+>>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
 public class ClusterInfo {
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index b9d6469a72365b..6d1ca37458ea18 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -3,6 +3,7 @@
 
 package chip.devicecontroller;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 import java.util.ArrayList;
@@ -153,10 +154,13 @@ public class ClusterInfoMapping {
 import java.util.List;
 =======
 import java.util.*;
+=======
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+>>>>>>> ef97f0702 (resolve type, nullable and format comments)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameterInfo;
-import chip.clusterinfo.ParameterType;
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.clusterinfo.ClusterCommandCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
@@ -236,63 +240,61 @@ public class ClusterInfoMapping {
      {{#chip_client_clusters}}
      Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfoMap = new LinkedHashMap<>();
      {{#chip_cluster_commands}}
-           Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-           // TODO: fill out parameter types
-           {{#if (zcl_command_arguments_count this.id)}}
-               {{#if hasSpecificResponse}}
-                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
-               {{else}}
-                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
-               {{/if}}
-               {{#chip_cluster_command_arguments_with_structs_expanded}}
-                 CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-                 {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
-                 {{#not_last}} {{/not_last}}
-               {{/chip_cluster_command_arguments_with_structs_expanded}}
-           {{else}}
-               {{#if hasSpecificResponse}}
-                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
-               {{else}}
-                 CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
-               {{/if}}
-           {{/if}}
-           // Populate commands
-           {{#if hasSpecificResponse}}
-           CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-                           .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
-                           {{#chip_cluster_command_arguments_with_structs_expanded}}
-                           ,
-                              ({{asJavaBoxedType type}})
-                            commandArguments.get("{{asLowerCamelCase label}}")
-                       {{/chip_cluster_command_arguments_with_structs_expanded}}
-                       );
-                   },
-                   () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
-                   {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
+     Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
+     // TODO: fill out parameter types
+     {{#if (zcl_command_arguments_count this.id)}}
+     {{#if hasSpecificResponse}}
+       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+     {{else}}
+       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+     {{/if}}
+     {{#chip_cluster_command_arguments_with_structs_expanded}}
+       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
+       {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
+     {{#not_last}} {{/not_last}}
+     {{/chip_cluster_command_arguments_with_structs_expanded}}
+     {{else}}
+     {{#if hasSpecificResponse}}
+       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
+     {{else}}
+       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
+     {{/if}}
+     {{/if}}
+     // Populate commands
+     {{#if hasSpecificResponse}}
+       CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
+         (cluster, callback, commandArguments) -> {
+           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
+           .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
+           {{#chip_cluster_command_arguments_with_structs_expanded}},
+           ({{asJavaBoxedType type}})
+           commandArguments.get("{{asLowerCamelCase label}}")
+           {{/chip_cluster_command_arguments_with_structs_expanded}}
            );
-           {{else}}
-           CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-                          .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
-                          {{#chip_cluster_command_arguments_with_structs_expanded}}
-                          ,
-                             ({{asJavaBoxedType type}})
-                           commandArguments.get("{{asLowerCamelCase label}}")
-                {{/chip_cluster_command_arguments_with_structs_expanded}}
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
+         },
+         () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
+           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
+       );
+     {{else}}
+       CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
+         (cluster, callback, commandArguments) -> {
+           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
+           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
+           {{#chip_cluster_command_arguments_with_structs_expanded}},
+           ({{asJavaBoxedType type}})
+           commandArguments.get("{{asLowerCamelCase label}}")
+           {{/chip_cluster_command_arguments_with_structs_expanded}}
            );
-           {{/if}}
-           {{asLowerCamelCase ../name}}ClusterCommandInfoMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
+         },
+         () -> new DelegatedDefaultClusterCallback(),
+           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
+       );
+     {{/if}}
+       {{asLowerCamelCase ../name}}ClusterCommandInfoMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
      {{/chip_cluster_commands}}
      // Populate cluster
      ClusterInfo {{asLowerCamelCase name}}ClusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfoMap);
+       (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfoMap);
      clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
      {{/chip_client_clusters}}
 <<<<<<< HEAD
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index ce06a52c645e28..977b49940c3e88 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -7508,7 +7508,8 @@ public Map<String, ClusterInfo> getClusterMap() {
 import chip.clusterinfo.CommandParameterInfo;
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 
 public class ClusterInfoMapping {
 

From a7b467d9f3997120e7ebe25e75edc4892aa57562 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 20 Oct 2021 15:08:16 -0400
Subject: [PATCH 20/38] resolve build issues

---
 src/controller/java/BUILD.gn                  | 19 +++++++++----------
 .../devicecontroller/ClusterInfoMapping.java  |  3 +++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 4908f7f65effd9..580e7194998f15 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -81,6 +81,7 @@ android_library("java") {
     "zap-generated/chip/devicecontroller/ChipClusters.java",
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
 =======
@@ -91,6 +92,14 @@ android_library("java") {
 >>>>>>> a4fd0282e (no error code generation)
 =======
 >>>>>>> fde1d13c0 (fix comments)
+=======
+    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
+    "src/chip/clusterinfo/ClusterInfo.java",
+    "src/chip/clusterinfo/ClusterCommandCallback.java",
+    "src/chip/clusterinfo/CommandInfo.java",
+    "src/chip/clusterinfo/CommandParameterInfo.java",
+    "src/chip/clusterinfo/DelegatedClusterCallback.java",
+>>>>>>> 75ba092b5 (resolve build issues)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
@@ -99,16 +108,6 @@ android_library("java") {
   #  ..../platforms/android-21/android.jar to access BLE items)
 }
 
-java_library("cluster_info") {
-  sources = [
-    "src/chip/clusterinfo/ClusterCommandCallback.java",
-    "src/chip/clusterinfo/ClusterInfo.java",
-    "src/chip/clusterinfo/CommandInfo.java",
-    "src/chip/clusterinfo/CommandParameterInfo.java",
-    "src/chip/clusterinfo/DelegatedClusterCallback.java",
-    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
-  ]
-}
 
 java_prebuilt("android") {
   jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 977b49940c3e88..82bc492ec4b557 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -7509,7 +7509,10 @@ public Map<String, ClusterInfo> getClusterMap() {
 import chip.clusterinfo.DelegatedClusterCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 public class ClusterInfoMapping {
 

From 61779a60d138b3d6c66a923f610c149a22778f77 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Wed, 20 Oct 2021 19:45:24 +0000
Subject: [PATCH 21/38] Restyled by gn

---
 src/controller/java/BUILD.gn | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 580e7194998f15..aea8397a339720 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -58,6 +58,7 @@ android_library("java") {
   ]
 
   sources = [
+<<<<<<< HEAD
 <<<<<<< HEAD
     "src/chip/clusterinfo/ClusterCommandCallback.java",
     "src/chip/clusterinfo/ClusterInfo.java",
@@ -72,6 +73,13 @@ android_library("java") {
 >>>>>>> 9199ce0a6 (Restyled by gn)
 =======
 >>>>>>> fde1d13c0 (fix comments)
+=======
+    "src/chip/clusterinfo/ClusterCommandCallback.java",
+    "src/chip/clusterinfo/ClusterInfo.java",
+    "src/chip/clusterinfo/CommandInfo.java",
+    "src/chip/clusterinfo/CommandParameterInfo.java",
+    "src/chip/clusterinfo/DelegatedClusterCallback.java",
+>>>>>>> 0411123b5 (Restyled by gn)
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",
     "src/chip/devicecontroller/ChipDeviceController.java",
@@ -94,12 +102,15 @@ android_library("java") {
 >>>>>>> fde1d13c0 (fix comments)
 =======
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
+<<<<<<< HEAD
     "src/chip/clusterinfo/ClusterInfo.java",
     "src/chip/clusterinfo/ClusterCommandCallback.java",
     "src/chip/clusterinfo/CommandInfo.java",
     "src/chip/clusterinfo/CommandParameterInfo.java",
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
 >>>>>>> 75ba092b5 (resolve build issues)
+=======
+>>>>>>> 0411123b5 (Restyled by gn)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
@@ -108,7 +119,6 @@ android_library("java") {
   #  ..../platforms/android-21/android.jar to access BLE items)
 }
 
-
 java_prebuilt("android") {
   jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
 }

From 985cca79c6cec41c66ea355a96f6f344a89ee444 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 20 Oct 2021 17:07:04 -0400
Subject: [PATCH 22/38] update zap generated file

---
 .../devicecontroller/ClusterInfoMapping.java  | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 82bc492ec4b557..b5c43386ab7899 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -9277,6 +9277,33 @@ public void onError(Exception error) {
     }
   }
 
+  public class DelegatedTestListInt8UReverseResponseCallback
+      implements ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback,
+          DelegatedClusterCallback {
+    private ClusterCommandCallback callback;
+
+    @Override
+    public void setCallbackDelegate(ClusterCommandCallback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void onSuccess(
+        // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
+        // Conversion from this type to Java is not properly implemented yet
+        ) {
+      List<Object> responseValues = new ArrayList<>();
+      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
+      // Conversion from this type to Java is not properly implemented yet
+      callback.onSuccess(responseValues);
+    }
+
+    @Override
+    public void onError(Exception error) {
+      callback.onFailure(error);
+    }
+  }
+
   public class DelegatedTestSpecificResponseCallback
       implements ChipClusters.TestClusterCluster.TestSpecificResponseCallback,
           DelegatedClusterCallback {
@@ -19669,6 +19696,32 @@ >>>>>>> fde1d13c0 (fix comments)
             testClustertestListInt8UArgumentRequestCommandParams);
     testClusterClusterCommandInfoMap.put(
         "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
+    Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo testClustertestListInt8UReverseRequestCommandParameterInfo =
+        new CommandParameterInfo(
+            "TestCluster",
+            ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback.class);
+    CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
+        new CommandParameterInfo("arg1", int.class);
+    testClustertestListInt8UReverseRequestCommandParams.put(
+        "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
+
+    // Populate commands
+    CommandInfo testClustertestListInt8UReverseRequestCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.TestClusterCluster) cluster)
+                  .testListInt8UReverseRequest(
+                      (ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback)
+                          callback,
+                      (Integer) commandArguments.get("arg1"));
+            },
+            () -> new DelegatedTestListInt8UReverseResponseCallback(),
+            testClustertestListInt8UReverseRequestCommandParams);
+    testClusterClusterCommandInfoMap.put(
+        "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types

From c2a424a409639d335cb5bf36b5a6f0f82dbd126d Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 20 Oct 2021 17:58:58 -0400
Subject: [PATCH 23/38] add descriptive documentation on each new class

---
 .../clusterinfo/ClusterCommandCallback.java   |  4 +++
 .../src/chip/clusterinfo/ClusterInfo.java     | 21 ++++++++++++++++
 .../src/chip/clusterinfo/CommandInfo.java     | 25 +++++++++++++++++++
 .../clusterinfo/CommandParameterInfo.java     |  6 +++++
 .../clusterinfo/DelegatedClusterCallback.java |  4 +++
 5 files changed, 60 insertions(+)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index b3068eef0dd75b..9258876df6ea9a 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -5,6 +5,7 @@
 import java.util.List;
 <<<<<<< HEAD
 
+<<<<<<< HEAD
 /**
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
@@ -17,6 +18,9 @@
 >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
 >>>>>>> 2d2bbd2e1 (new design solution)
+=======
+/** Interface for making customized callback that implements both onSuccess and onFailure function */
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public interface ClusterCommandCallback {
   void onSuccess(List<Object> responseValues);
 
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index fd330a4768679f..67ca17d4a22a20 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -15,11 +15,25 @@
 import java.util.Map;
 >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
+<<<<<<< HEAD
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
+=======
+/**
+ * ClusterInfo includes a functional interface to create arbitrary clusters and a map
+ * <String, CommandInfo> to retrieve CommandInfo object from clusterInteractionFragment.kt
+ */
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public class ClusterInfo {
   private final ClusterConstructor createClusterFunction;
   private final Map<String, CommandInfo> commands;
 
+  /**
+   * Constructor
+   *
+   * @param createClusterFunction the function that can construct Cluster object
+   * @param commands the Map that can provide easy access to CommandInfo
+   */
+
   public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
     this.createClusterFunction = createClusterFunction;
     this.commands = commands;
@@ -34,9 +48,16 @@ public Map<String, CommandInfo> getCommands() {
   }
 
   /**
+<<<<<<< HEAD
    * The functional interface provides a uniform way to create cluster through create function. In
    * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
    * lambda function, it only needs to have ptr and endpointId to create the intended cluster.
+=======
+   * The functional interface provides a uniform way to create cluster through create
+   * function. In ClusterInfoMapping, each ClusterConstructor was generated using the
+   * intended function. Using lambda function, the app component only needs to have ptr
+   * and endpointId to create the intended cluster.
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
    */
   @FunctionalInterface
   public interface ClusterConstructor {
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 12a1f6882d020f..ab3b49fe46b658 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -9,15 +9,31 @@
 import java.util.function.Supplier;
 
 /**
+<<<<<<< HEAD
  * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
  * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
  * parameter and commandParametersInfo.
  */
 public class CommandInfo {
+=======
+ * CommandInfo includes a functional interface to invoke arbitrary commands based on cluster,
+ * callback and a map of arguments, a Supplier that provides DelegatedClusterCallback, and a
+ * Map that includes the name of the parameter and commandParametersInfo.
+ */
+
+ public class CommandInfo {
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
   private Map<String, CommandParameterInfo> commandParameters;
 
+  /**
+   * Constructor
+   *
+   * @param commandFunction the function that can construct invoke arbitrary cluster command
+   * @param commandCallbackSupplier the Supplier that provides DelegatedClusterCallback
+   * @param commandParameters the Map that contains parameter names and CommandParameterInfo
+   */
   public CommandInfo(
       ClusterCommandFunction commandFunction,
       Supplier<DelegatedClusterCallback> commandCallbackSupplier,
@@ -39,12 +55,21 @@ public Map<String, CommandParameterInfo> getCommandParameters() {
     return commandParameters;
   }
 
+<<<<<<< HEAD
   /**
    * The functional interface provides a uniform way to invoke commands through invokeCommand
    * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the intended
    * function. By using lambda function, the app component only needs to have cluster, callback,
    * commandArguments to execute the correct function.
    */
+=======
+
+  /** The functional interface provides a uniform way to invoke commands through invokeCommand
+  * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the
+  * intended function. Using lambda function, the app component only needs to have cluster,
+  * callback, commandArguments to execute the correct function.
+  */
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
   @FunctionalInterface
   public interface ClusterCommandFunction {
     void invokeCommand(
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index a951da990fb30d..c2873324959e13 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -1,9 +1,15 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
 =======
 >>>>>>> fde1d13c0 (fix comments)
+=======
+/** CommandParameterInfo includes a name filed, which represents the name of the paremeter. It  */
+/** also contains a type field to specify what type this commandParameter is, i.e String.class  */
+
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index 71dadaf5374723..aea1579df28aa7 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -3,7 +3,11 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
+=======
+/** Interface for setting customized ClusterCommandCallback in ClusterInteractionFragment.kt */
+>>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }

From 56417fd4c2df2f87c435dc97139577e9f4d0f88b Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Wed, 20 Oct 2021 22:09:16 +0000
Subject: [PATCH 24/38] Restyled by google-java-format

---
 .../clusterinfo/ClusterCommandCallback.java     |  6 ++++++
 .../java/src/chip/clusterinfo/ClusterInfo.java  | 12 +++++++++---
 .../java/src/chip/clusterinfo/CommandInfo.java  | 17 +++++++++++++++--
 .../chip/clusterinfo/CommandParameterInfo.java  |  5 +++++
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index 9258876df6ea9a..8e418534328432 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -5,6 +5,7 @@
 import java.util.List;
 <<<<<<< HEAD
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /**
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
@@ -21,6 +22,11 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 =======
 /** Interface for making customized callback that implements both onSuccess and onFailure function */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+/**
+ * Interface for making customized callback that implements both onSuccess and onFailure function
+ */
+>>>>>>> e3803522e (Restyled by google-java-format)
 public interface ClusterCommandCallback {
   void onSuccess(List<Object> responseValues);
 
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 67ca17d4a22a20..82dbf96d953724 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -19,8 +19,8 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
 =======
 /**
- * ClusterInfo includes a functional interface to create arbitrary clusters and a map
- * <String, CommandInfo> to retrieve CommandInfo object from clusterInteractionFragment.kt
+ * ClusterInfo includes a functional interface to create arbitrary clusters and a map <String,
+ * CommandInfo> to retrieve CommandInfo object from clusterInteractionFragment.kt
  */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public class ClusterInfo {
@@ -33,7 +33,6 @@ public class ClusterInfo {
    * @param createClusterFunction the function that can construct Cluster object
    * @param commands the Map that can provide easy access to CommandInfo
    */
-
   public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
     this.createClusterFunction = createClusterFunction;
     this.commands = commands;
@@ -48,6 +47,7 @@ public Map<String, CommandInfo> getCommands() {
   }
 
   /**
+<<<<<<< HEAD
 <<<<<<< HEAD
    * The functional interface provides a uniform way to create cluster through create function. In
    * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
@@ -58,6 +58,12 @@ public Map<String, CommandInfo> getCommands() {
    * intended function. Using lambda function, the app component only needs to have ptr
    * and endpointId to create the intended cluster.
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+   * The functional interface provides a uniform way to create cluster through create function. In
+   * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
+   * lambda function, the app component only needs to have ptr and endpointId to create the intended
+   * cluster.
+>>>>>>> e3803522e (Restyled by google-java-format)
    */
   @FunctionalInterface
   public interface ClusterConstructor {
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index ab3b49fe46b658..0f8b4f2d32285f 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -17,12 +17,16 @@
 public class CommandInfo {
 =======
  * CommandInfo includes a functional interface to invoke arbitrary commands based on cluster,
- * callback and a map of arguments, a Supplier that provides DelegatedClusterCallback, and a
- * Map that includes the name of the parameter and commandParametersInfo.
+ * callback and a map of arguments, a Supplier that provides DelegatedClusterCallback, and a Map
+ * that includes the name of the parameter and commandParametersInfo.
  */
+<<<<<<< HEAD
 
  public class CommandInfo {
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+public class CommandInfo {
+>>>>>>> e3803522e (Restyled by google-java-format)
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
   private Map<String, CommandParameterInfo> commandParameters;
@@ -55,6 +59,7 @@ public Map<String, CommandParameterInfo> getCommandParameters() {
     return commandParameters;
   }
 
+<<<<<<< HEAD
 <<<<<<< HEAD
   /**
    * The functional interface provides a uniform way to invoke commands through invokeCommand
@@ -70,6 +75,14 @@ public Map<String, CommandParameterInfo> getCommandParameters() {
   * callback, commandArguments to execute the correct function.
   */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+  /**
+   * The functional interface provides a uniform way to invoke commands through invokeCommand
+   * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the intended
+   * function. Using lambda function, the app component only needs to have cluster, callback,
+   * commandArguments to execute the correct function.
+   */
+>>>>>>> e3803522e (Restyled by google-java-format)
   @FunctionalInterface
   public interface ClusterCommandFunction {
     void invokeCommand(
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index c2873324959e13..30cc90d30f1713 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -1,5 +1,6 @@
 package chip.clusterinfo;
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
@@ -10,6 +11,10 @@ >>>>>>> fde1d13c0 (fix comments)
 /** also contains a type field to specify what type this commandParameter is, i.e String.class  */
 
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+/** CommandParameterInfo includes a name filed, which represents the name of the paremeter. It */
+/** also contains a type field to specify what type this commandParameter is, i.e String.class */
+>>>>>>> e3803522e (Restyled by google-java-format)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 

From 19ac32a3e752d6293826826158b25548a36fd4f5 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 20 Oct 2021 20:48:07 -0400
Subject: [PATCH 25/38] modify description of each new added class

---
 .../java/src/chip/clusterinfo/ClusterInfo.java    | 11 ++---------
 .../java/src/chip/clusterinfo/CommandInfo.java    | 15 +++++++--------
 .../chip/clusterinfo/CommandParameterInfo.java    |  7 +++++++
 .../clusterinfo/DelegatedClusterCallback.java     |  4 ++++
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 82dbf96d953724..74bff4d6adeb8e 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -19,20 +19,13 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
 =======
 /**
- * ClusterInfo includes a functional interface to create arbitrary clusters and a map <String,
- * CommandInfo> to retrieve CommandInfo object from clusterInteractionFragment.kt
+  ClusterInfo maps commands and provides a constructor function for a cluster
  */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
 public class ClusterInfo {
   private final ClusterConstructor createClusterFunction;
   private final Map<String, CommandInfo> commands;
 
-  /**
-   * Constructor
-   *
-   * @param createClusterFunction the function that can construct Cluster object
-   * @param commands the Map that can provide easy access to CommandInfo
-   */
   public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
     this.createClusterFunction = createClusterFunction;
     this.commands = commands;
@@ -61,7 +54,7 @@ public Map<String, CommandInfo> getCommands() {
 =======
    * The functional interface provides a uniform way to create cluster through create function. In
    * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
-   * lambda function, the app component only needs to have ptr and endpointId to create the intended
+   * lambda function, it only needs to have ptr and endpointId to create the intended
    * cluster.
 >>>>>>> e3803522e (Restyled by google-java-format)
    */
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 0f8b4f2d32285f..af6587fd842a0f 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -9,6 +9,7 @@
 import java.util.function.Supplier;
 
 /**
+<<<<<<< HEAD
 <<<<<<< HEAD
  * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
  * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
@@ -19,6 +20,11 @@ public class CommandInfo {
  * CommandInfo includes a functional interface to invoke arbitrary commands based on cluster,
  * callback and a map of arguments, a Supplier that provides DelegatedClusterCallback, and a Map
  * that includes the name of the parameter and commandParametersInfo.
+=======
+ * CommandInfo has a functional interface to invoke arbitrary commands based on cluster,
+ * callback and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and
+ * maps the parameter and commandParametersInfo.
+>>>>>>> 4054a1371 (modify description of each new added class)
  */
 <<<<<<< HEAD
 
@@ -31,13 +37,6 @@ >>>>>>> e3803522e (Restyled by google-java-format)
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
   private Map<String, CommandParameterInfo> commandParameters;
 
-  /**
-   * Constructor
-   *
-   * @param commandFunction the function that can construct invoke arbitrary cluster command
-   * @param commandCallbackSupplier the Supplier that provides DelegatedClusterCallback
-   * @param commandParameters the Map that contains parameter names and CommandParameterInfo
-   */
   public CommandInfo(
       ClusterCommandFunction commandFunction,
       Supplier<DelegatedClusterCallback> commandCallbackSupplier,
@@ -79,7 +78,7 @@ public Map<String, CommandParameterInfo> getCommandParameters() {
   /**
    * The functional interface provides a uniform way to invoke commands through invokeCommand
    * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the intended
-   * function. Using lambda function, the app component only needs to have cluster, callback,
+   * function. By using lambda function, the app component only needs to have cluster, callback,
    * commandArguments to execute the correct function.
    */
 >>>>>>> e3803522e (Restyled by google-java-format)
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index 30cc90d30f1713..afacd6423a53bc 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -3,6 +3,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
 =======
 >>>>>>> fde1d13c0 (fix comments)
@@ -15,6 +16,12 @@ >>>>>>> fde1d13c0 (fix comments)
 /** CommandParameterInfo includes a name filed, which represents the name of the paremeter. It */
 /** also contains a type field to specify what type this commandParameter is, i.e String.class */
 >>>>>>> e3803522e (Restyled by google-java-format)
+=======
+/**
+ * CommandParameterInfo captures the name and type of a parameter
+ */
+
+>>>>>>> 4054a1371 (modify description of each new added class)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index aea1579df28aa7..075cc93311d872 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -4,10 +4,14 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
 =======
 /** Interface for setting customized ClusterCommandCallback in ClusterInteractionFragment.kt */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+/** Interface for a callback that delegates to {@link ClusterCommandCallback} */
+>>>>>>> 4054a1371 (modify description of each new added class)
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }

From e8e545d81974887ce561e04add64d4ba0d005981 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Thu, 21 Oct 2021 00:48:57 +0000
Subject: [PATCH 26/38] Restyled by google-java-format

---
 src/controller/java/src/chip/clusterinfo/ClusterInfo.java | 8 ++++++++
 src/controller/java/src/chip/clusterinfo/CommandInfo.java | 6 ++++++
 .../java/src/chip/clusterinfo/CommandParameterInfo.java   | 4 ++++
 3 files changed, 18 insertions(+)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 74bff4d6adeb8e..31154b5ad5bdee 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
 =======
@@ -22,6 +23,9 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
   ClusterInfo maps commands and provides a constructor function for a cluster
  */
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
+=======
+/** ClusterInfo maps commands and provides a constructor function for a cluster */
+>>>>>>> 68e157c68 (Restyled by google-java-format)
 public class ClusterInfo {
   private final ClusterConstructor createClusterFunction;
   private final Map<String, CommandInfo> commands;
@@ -54,9 +58,13 @@ public Map<String, CommandInfo> getCommands() {
 =======
    * The functional interface provides a uniform way to create cluster through create function. In
    * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
+<<<<<<< HEAD
    * lambda function, it only needs to have ptr and endpointId to create the intended
    * cluster.
 >>>>>>> e3803522e (Restyled by google-java-format)
+=======
+   * lambda function, it only needs to have ptr and endpointId to create the intended cluster.
+>>>>>>> 68e157c68 (Restyled by google-java-format)
    */
   @FunctionalInterface
   public interface ClusterConstructor {
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index af6587fd842a0f..0360dab8ed3133 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -10,6 +10,7 @@
 
 /**
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
  * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
@@ -25,6 +26,11 @@ public class CommandInfo {
  * callback and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and
  * maps the parameter and commandParametersInfo.
 >>>>>>> 4054a1371 (modify description of each new added class)
+=======
+ * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
+ * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
+ * parameter and commandParametersInfo.
+>>>>>>> 68e157c68 (Restyled by google-java-format)
  */
 <<<<<<< HEAD
 
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index afacd6423a53bc..650d776d8a7e35 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -4,6 +4,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
 =======
 >>>>>>> fde1d13c0 (fix comments)
@@ -22,6 +23,9 @@ >>>>>>> e3803522e (Restyled by google-java-format)
  */
 
 >>>>>>> 4054a1371 (modify description of each new added class)
+=======
+/** CommandParameterInfo captures the name and type of a parameter */
+>>>>>>> 68e157c68 (Restyled by google-java-format)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 

From 2b9236d022439a5d9bec5cebb0d05cbe1e0a8713 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 20 Oct 2021 20:59:23 -0400
Subject: [PATCH 27/38] add . at the end of class description

---
 .../java/src/chip/clusterinfo/ClusterCommandCallback.java   | 2 +-
 src/controller/java/src/chip/clusterinfo/ClusterInfo.java   | 4 ++++
 .../java/src/chip/clusterinfo/CommandParameterInfo.java     | 6 ++++++
 .../java/src/chip/clusterinfo/DelegatedClusterCallback.java | 4 ++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index 8e418534328432..b39bc180f327ee 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -24,7 +24,7 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 >>>>>>> 2185ce827 (add descriptive documentation on each new class)
 =======
 /**
- * Interface for making customized callback that implements both onSuccess and onFailure function
+ * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
 >>>>>>> e3803522e (Restyled by google-java-format)
 public interface ClusterCommandCallback {
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 31154b5ad5bdee..cc31923e0b385d 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -15,6 +15,7 @@
 import java.util.Map;
 >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
@@ -26,6 +27,9 @@ >>>>>>> ef97f0702 (resolve type, nullable and format comments)
 =======
 /** ClusterInfo maps commands and provides a constructor function for a cluster */
 >>>>>>> 68e157c68 (Restyled by google-java-format)
+=======
+/** ClusterInfo maps commands and provides a constructor function for a cluster. */
+>>>>>>> 74fe2b5bd (add . at the end of class description)
 public class ClusterInfo {
   private final ClusterConstructor createClusterFunction;
   private final Map<String, CommandInfo> commands;
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index 650d776d8a7e35..16695e1cba164c 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -5,6 +5,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
 =======
 >>>>>>> fde1d13c0 (fix comments)
@@ -26,6 +27,11 @@ >>>>>>> e3803522e (Restyled by google-java-format)
 =======
 /** CommandParameterInfo captures the name and type of a parameter */
 >>>>>>> 68e157c68 (Restyled by google-java-format)
+=======
+/**
+ * CommandParameterInfo captures the name and type of a parameter
+ */
+>>>>>>> 74fe2b5bd (add . at the end of class description)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index 075cc93311d872..bfae8e2149c6de 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -5,6 +5,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
 =======
 /** Interface for setting customized ClusterCommandCallback in ClusterInteractionFragment.kt */
@@ -12,6 +13,9 @@
 =======
 /** Interface for a callback that delegates to {@link ClusterCommandCallback} */
 >>>>>>> 4054a1371 (modify description of each new added class)
+=======
+/** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
+>>>>>>> 74fe2b5bd (add . at the end of class description)
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
 }

From a5c4a03a64ae9bd7fe44ab0df1d0bdedc8f7c7b1 Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Thu, 21 Oct 2021 00:59:56 +0000
Subject: [PATCH 28/38] Restyled by google-java-format

---
 .../java/src/chip/clusterinfo/CommandParameterInfo.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index 16695e1cba164c..7bdb9fe2b3a61a 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -6,6 +6,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
 =======
 >>>>>>> fde1d13c0 (fix comments)
@@ -32,6 +33,9 @@ >>>>>>> e3803522e (Restyled by google-java-format)
  * CommandParameterInfo captures the name and type of a parameter
  */
 >>>>>>> 74fe2b5bd (add . at the end of class description)
+=======
+/** CommandParameterInfo captures the name and type of a parameter */
+>>>>>>> 85f45fb7a (Restyled by google-java-format)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 

From fe8f793eb20d8c5f65806778abe26df90a438c71 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 25 Oct 2021 14:07:01 -0400
Subject: [PATCH 29/38] add recycler view to display endpoint

---
 .../.idea/deploymentTargetDropDown.xml        |   17 +
 .../google/chip/chiptool/CHIPToolActivity.kt  |    2 +-
 .../ClusterInteractionFragment.kt             |   13 +-
 .../clusterinteraction/EndpointAdapter.kt     |   31 +
 .../clusterinteraction/endpointItem.kt        |    3 +
 .../layout/cluster_interaction_fragment.xml   |    8 +-
 .../app/src/main/res/layout/endpoint_item.xml |   30 +
 .../java/zap-generated/CHIPClusters-JNI.cpp   | 5401 +++++------------
 .../chip/devicecontroller/ChipClusters.java   |  936 +--
 .../devicecontroller/ClusterInfoMapping.java  |  402 +-
 10 files changed, 2388 insertions(+), 4455 deletions(-)
 create mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
 rename src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/{ => clusterinteraction}/ClusterInteractionFragment.kt (92%)
 create mode 100644 src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
 create mode 100644 src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
 create mode 100644 src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000000000..5f90c3435a4aee
--- /dev/null
+++ b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="12171FDD4002GB" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2021-10-25T17:50:07.909204Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
index f40f7e6438b952..fa906cbd3c1d48 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/CHIPToolActivity.kt
@@ -31,7 +31,7 @@ import chip.setuppayload.SetupPayload
 import chip.setuppayload.SetupPayloadParser
 import chip.setuppayload.SetupPayloadParser.UnrecognizedQrCodeException
 import com.google.chip.chiptool.attestation.AttestationTestFragment
-import com.google.chip.chiptool.clusterclient.ClusterInteractionFragment
+import com.google.chip.chiptool.clusterclient.clusterinteraction.ClusterInteractionFragment
 import com.google.chip.chiptool.clusterclient.MultiAdminClientFragment
 import com.google.chip.chiptool.clusterclient.OpCredClientFragment
 import com.google.chip.chiptool.clusterclient.BasicClientFragment
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
similarity index 92%
rename from src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
rename to src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 21e7767efa919e..bc2e540e5f8bcd 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -1,12 +1,14 @@
-package com.google.chip.chiptool.clusterclient
+package com.google.chip.chiptool.clusterclient.clusterinteraction
 
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import chip.clusterinfo.ClusterCommandCallback
 import chip.clusterinfo.ClusterInfo
 import chip.clusterinfo.CommandInfo
@@ -21,7 +23,9 @@ import kotlinx.coroutines.cancel
 <<<<<<< HEAD
 <<<<<<< HEAD
 import chip.devicecontroller.ClusterInfoMapping
+import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
 import java.lang.Exception
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.endpointList
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 
@@ -64,6 +68,13 @@ class ClusterInteractionFragment : Fragment() {
 <<<<<<< HEAD
       clusterMap = ClusterInfoMapping().clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
+      var dataList: List<EndpointItem> = ArrayList<EndpointItem>()
+      for (i in 0 until 40) {
+        dataList += EndpointItem(i)
+      }
+
+      endpointList.adapter = EndpointAdapter(dataList)
+      endpointList.layoutManager = LinearLayoutManager(requireContext())
     }
   }
 
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
new file mode 100644
index 00000000000000..ff33dab694ecea
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -0,0 +1,31 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.google.chip.chiptool.R
+
+class EndpointAdapter(private val endpointList: List<EndpointItem>) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
+
+  class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    val endpointId: TextView = itemView.findViewById(R.id.endpoint_id)
+
+  }
+
+  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EndpointViewHolder {
+    val itemView = LayoutInflater.from(parent.context).inflate(R.layout.endpoint_item, parent, false)
+    return EndpointViewHolder(itemView)
+  }
+
+  override fun onBindViewHolder(holder: EndpointViewHolder, position: Int) {
+    val currentItem = endpointList[position]
+
+    holder.endpointId.text = currentItem.endpointId.toString()
+  }
+
+  override fun getItemCount(): Int {
+    return endpointList.size
+  }
+}
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
new file mode 100644
index 00000000000000..be33d661e871e7
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/endpointItem.kt
@@ -0,0 +1,3 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+data class EndpointItem(val endpointId: Int)
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
index f101f9d7626204..4930780d80eb3f 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
@@ -25,11 +25,9 @@
       app:layout_constraintTop_toTopOf="parent" />
   <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/endpointList"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_marginTop="180dp"
-      android:clipToPadding="false"
+      android:layout_width="409dp"
+      android:layout_height="549dp"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/addressUpdateFragment" />
+      app:layout_constraintTop_toBottomOf="@+id/getClusterMappingBtn" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
new file mode 100644
index 00000000000000..7174cf46cde93e
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+  <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:padding="8dp"
+      android:layout_margin="4dp">
+
+    <TextView
+        android:id="@+id/endpoint_id"
+        android:textStyle="bold"
+        android:width="100dp"
+        android:height="70dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="endpoint 1"
+        android:textColor="@android:color/black"
+        android:textSize="18sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index 75d3f2ad34c00c..51ace595fe40b1 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -17,12 +17,8 @@
 
 // THIS FILE IS GENERATED BY ZAP
 
-<<<<<<< HEAD
 #include <app-common/zap-generated/cluster-objects.h>
 #include <app/data-model/DecodableList.h>
-#include <zap-generated/CHIPClusters.h>
-=======
->>>>>>> e993d01f0 (callback generation done)
 #include <zap-generated/CHIPClientCallbacks.h>
 #include <zap-generated/CHIPClusters.h>
 
@@ -320,20 +316,8 @@ class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttr
             ChipLogError(Zcl, "Could not create global reference for Java callback");
             return;
         }
-<<<<<<< HEAD
-
-        static void maybeDestroy(CHIPCharStringAttributeCallback * callback) {
-            if (!callback->keepAlive) {
-                callback->Cancel();
-                delete callback;
-            }
-        }
-
-        static void CallbackFn(void * context, const chip::CharSpan value)
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
->>>>>>> e993d01f0 (callback generation done)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
         }
@@ -348,7 +332,7 @@ class CHIPCharStringAttributeCallback : public Callback::Callback<CharStringAttr
         }
     }
 
-    static void CallbackFn(void * context, const chip::ByteSpan value)
+    static void CallbackFn(void * context, const chip::CharSpan value)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -895,53 +879,7 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Call
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, chip::CharSpan setupPIN)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPAccountLoginClusterGetSetupPINResponseCallback * cppCallback = nullptr;
-            UtfString setupPINStr(env, setupPIN);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPAccountLoginClusterGetSetupPINResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , setupPINStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPAccountLoginClusterGetSetupPINResponseCallback()
@@ -955,7 +893,7 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Call
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t * setupPIN)
+    static void CallbackFn(void * context, chip::CharSpan setupPIN)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -963,8 +901,7 @@ class CHIPAccountLoginClusterGetSetupPINResponseCallback : public Callback::Call
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPAccountLoginClusterGetSetupPINResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString setupPINStr(env, "");
+        UtfString setupPINStr(env, setupPIN);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -1012,54 +949,7 @@ class CHIPApplicationLauncherClusterLaunchAppResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPApplicationLauncherClusterLaunchAppResponseCallback * cppCallback = nullptr;
-            UtfString dataStr(env, data);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPApplicationLauncherClusterLaunchAppResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , dataStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPApplicationLauncherClusterLaunchAppResponseCallback()
@@ -1073,7 +963,7 @@ class CHIPApplicationLauncherClusterLaunchAppResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t status, uint8_t * data)
+    static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1081,8 +971,7 @@ class CHIPApplicationLauncherClusterLaunchAppResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPApplicationLauncherClusterLaunchAppResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString dataStr(env, "");
+        UtfString dataStr(env, data);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -1130,54 +1019,7 @@ class CHIPContentLauncherClusterLaunchContentResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPContentLauncherClusterLaunchContentResponseCallback * cppCallback = nullptr;
-            UtfString dataStr(env, data);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchContentResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , dataStr.jniValue()
-                , static_cast<jint>(contentLaunchStatus)
-                            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPContentLauncherClusterLaunchContentResponseCallback()
@@ -1191,7 +1033,7 @@ class CHIPContentLauncherClusterLaunchContentResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
+    static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1199,8 +1041,7 @@ class CHIPContentLauncherClusterLaunchContentResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPContentLauncherClusterLaunchContentResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString dataStr(env, "");
+        UtfString dataStr(env, data);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -1248,54 +1089,7 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPContentLauncherClusterLaunchURLResponseCallback * cppCallback = nullptr;
-            UtfString dataStr(env, data);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPContentLauncherClusterLaunchURLResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/String;I)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , dataStr.jniValue()
-                , static_cast<jint>(contentLaunchStatus)
-                            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPContentLauncherClusterLaunchURLResponseCallback()
@@ -1309,7 +1103,7 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t * data, uint8_t contentLaunchStatus)
+    static void CallbackFn(void * context, chip::CharSpan data, uint8_t contentLaunchStatus)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -1317,8 +1111,7 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPContentLauncherClusterLaunchURLResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString dataStr(env, "");
+        UtfString dataStr(env, data);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -1349,80 +1142,83 @@ class CHIPContentLauncherClusterLaunchURLResponseCallback
     jobject javaCallbackRef;
 };
 
-class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
-{
-    public:
-        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback): Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
-        }
-        ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback * cppCallback = nullptr;
-            jbyteArray contentArr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I[BJJ)V", &javaMethod);
-            SuccessOrExit(err);
-
-            contentArr = env->NewByteArray(content.size());
-            VerifyOrExit(contentArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(contentArr, 0, content.size(), reinterpret_cast<const jbyte *>(content.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , contentArr
-                , static_cast<jlong>(timeStamp)
-                                , static_cast<jlong>(timeSinceBoot)
-                            );
-
-            env->DeleteLocalRef(contentArr);
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-        }
-        
-    private:
+class CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback
+    : public Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>
+{
+public:
+    CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback(jobject javaCallback) :
+        Callback::Callback<DiagnosticLogsClusterRetrieveLogsResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
+
+    static void CallbackFn(void * context, uint8_t status, chip::ByteSpan content, uint32_t timeStamp, uint32_t timeSinceBoot)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
         jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback * cppCallback = nullptr;
+        jbyteArray contentArr;
+
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+
+        cppCallback = reinterpret_cast<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(I[BJJ)V", &javaMethod);
+        SuccessOrExit(err);
+
+        contentArr = env->NewByteArray(content.size());
+        VerifyOrExit(contentArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
+        env->ExceptionClear();
+        env->SetByteArrayRegion(contentArr, 0, content.size(), reinterpret_cast<const jbyte *>(content.data()));
+        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
+
+        env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(status), contentArr, static_cast<jlong>(timeStamp),
+                            static_cast<jlong>(timeSinceBoot));
+
+        env->DeleteLocalRef(contentArr);
+
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
+        }
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPDoorLockClusterClearAllPinsResponseCallback : public Callback::Callback<DoorLockClusterClearAllPinsResponseCallback>
@@ -3056,54 +2852,7 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterArmFailSafeResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPGeneralCommissioningClusterArmFailSafeResponseCallback()
@@ -3117,7 +2866,7 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3125,8 +2874,7 @@ class CHIPGeneralCommissioningClusterArmFailSafeResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPGeneralCommissioningClusterArmFailSafeResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -3174,54 +2922,7 @@ class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback()
@@ -3235,7 +2936,7 @@ class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3243,8 +2944,7 @@ class CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -3292,54 +2992,7 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback()
@@ -3353,7 +3006,7 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3361,8 +3014,7 @@ class CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -3618,55 +3270,7 @@ class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<Gro
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
-            UtfString groupNameStr(env, groupName);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPGroupsClusterViewGroupResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , groupNameStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPGroupsClusterViewGroupResponseCallback()
@@ -3680,7 +3284,7 @@ class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<Gro
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t * groupName)
+    static void CallbackFn(void * context, uint8_t status, uint16_t groupId, chip::CharSpan groupName)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -3688,8 +3292,7 @@ class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback<Gro
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPGroupsClusterViewGroupResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString groupNameStr(env, "");
+        UtfString groupNameStr(env, groupName);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -4628,54 +4231,7 @@ class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback()
@@ -4689,7 +4245,7 @@ class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4697,8 +4253,7 @@ class CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterAddThreadNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -4746,54 +4301,7 @@ class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback()
@@ -4807,7 +4315,7 @@ class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4815,8 +4323,7 @@ class CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterAddWiFiNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -4864,54 +4371,7 @@ class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterDisableNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterDisableNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterDisableNetworkResponseCallback()
@@ -4925,7 +4385,7 @@ class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -4933,8 +4393,7 @@ class CHIPNetworkCommissioningClusterDisableNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterDisableNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -4982,54 +4441,7 @@ class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterEnableNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterEnableNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterEnableNetworkResponseCallback()
@@ -5043,7 +4455,7 @@ class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5051,8 +4463,7 @@ class CHIPNetworkCommissioningClusterEnableNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterEnableNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -5100,54 +4511,7 @@ class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback()
@@ -5161,7 +4525,7 @@ class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5169,8 +4533,7 @@ class CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterRemoveNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -5218,58 +4581,7 @@ class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText, /* TYPE WARNING: array array defaults to */ uint8_t *  wifiScanResults, /* TYPE WARNING: array array defaults to */ uint8_t *  threadScanResults)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterScanNetworksResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterScanNetworksResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-                // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-                // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterScanNetworksResponseCallback()
@@ -5283,7 +4595,7 @@ class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText,
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText,
                            /* TYPE WARNING: array array defaults to */ uint8_t * wifiScanResults,
                            /* TYPE WARNING: array array defaults to */ uint8_t * threadScanResults)
     {
@@ -5293,8 +4605,7 @@ class CHIPNetworkCommissioningClusterScanNetworksResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterScanNetworksResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -5347,54 +4658,7 @@ class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback()
@@ -5408,7 +4672,7 @@ class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5416,8 +4680,7 @@ class CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterUpdateThreadNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -5465,54 +4728,7 @@ class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback * cppCallback = nullptr;
-            UtfString debugTextStr(env, debugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(errorCode)
-                                , debugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback()
@@ -5526,7 +4742,7 @@ class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t errorCode, uint8_t * debugText)
+    static void CallbackFn(void * context, uint8_t errorCode, chip::CharSpan debugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5534,8 +4750,7 @@ class CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPNetworkCommissioningClusterUpdateWiFiNetworkResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString debugTextStr(env, "");
+        UtfString debugTextStr(env, debugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -5652,75 +4867,7 @@ class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, chip::CharSpan imageURI, uint32_t softwareVersion, chip::CharSpan softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback * cppCallback = nullptr;
-            UtfString imageURIStr(env, imageURI);
-                        UtfString softwareVersionStringStr(env, softwareVersionString);
-                        jbyteArray updateTokenArr;
-            jbyteArray metadataForRequestorArr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IJLjava/lang/String;JLjava/lang/String;[BZ[B)V", &javaMethod);
-            SuccessOrExit(err);
-
-            updateTokenArr = env->NewByteArray(updateToken.size());
-            VerifyOrExit(updateTokenArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(updateTokenArr, 0, updateToken.size(), reinterpret_cast<const jbyte *>(updateToken.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-            metadataForRequestorArr = env->NewByteArray(metadataForRequestor.size());
-            VerifyOrExit(metadataForRequestorArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-            env->ExceptionClear();
-            env->SetByteArrayRegion(metadataForRequestorArr, 0, metadataForRequestor.size(), reinterpret_cast<const jbyte *>(metadataForRequestor.data()));
-            VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jlong>(delayedActionTime)
-                                , imageURIStr.jniValue()
-                , static_cast<jlong>(softwareVersion)
-                                , softwareVersionStringStr.jniValue()
-                , updateTokenArr
-                , static_cast<jboolean>(userConsentNeeded)
-                                , metadataForRequestorArr
-            );
-
-            env->DeleteLocalRef(updateTokenArr);
-            env->DeleteLocalRef(metadataForRequestorArr);
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback()
@@ -5734,9 +4881,9 @@ class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, uint8_t * imageURI, uint32_t softwareVersion,
-                           uint8_t * softwareVersionString, chip::ByteSpan updateToken, bool userConsentNeeded,
-                           chip::ByteSpan metadataForRequestor)
+    static void CallbackFn(void * context, uint8_t status, uint32_t delayedActionTime, chip::CharSpan imageURI,
+                           uint32_t softwareVersion, chip::CharSpan softwareVersionString, chip::ByteSpan updateToken,
+                           bool userConsentNeeded, chip::ByteSpan metadataForRequestor)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -5744,10 +4891,8 @@ class CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString imageURIStr(env, "");
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString softwareVersionStringStr(env, "");
+        UtfString imageURIStr(env, imageURI);
+        UtfString softwareVersionStringStr(env, softwareVersionString);
         jbyteArray updateTokenArr;
         jbyteArray metadataForRequestorArr;
 
@@ -5979,55 +5124,7 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::CharSpan DebugText)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPOperationalCredentialsClusterNOCResponseCallback * cppCallback = nullptr;
-            UtfString DebugTextStr(env, DebugText);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPOperationalCredentialsClusterNOCResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(StatusCode)
-                                , static_cast<jint>(FabricIndex)
-                                , DebugTextStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPOperationalCredentialsClusterNOCResponseCallback()
@@ -6041,7 +5138,7 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::ByteSpan DebugText)
+    static void CallbackFn(void * context, uint8_t StatusCode, uint8_t FabricIndex, chip::CharSpan DebugText)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6049,7 +5146,7 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPOperationalCredentialsClusterNOCResponseCallback * cppCallback = nullptr;
-        jbyteArray DebugTextArr;
+        UtfString DebugTextStr(env, DebugText);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -6059,19 +5156,11 @@ class CHIPOperationalCredentialsClusterNOCResponseCallback
         javaCallbackRef = cppCallback->javaCallbackRef;
         VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(II[B)V", &javaMethod);
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IILjava/lang/String;)V", &javaMethod);
         SuccessOrExit(err);
 
-        DebugTextArr = env->NewByteArray(DebugText.size());
-        VerifyOrExit(DebugTextArr != nullptr, err = CHIP_ERROR_NO_MEMORY);
-        env->ExceptionClear();
-        env->SetByteArrayRegion(DebugTextArr, 0, DebugText.size(), reinterpret_cast<const jbyte *>(DebugText.data()));
-        VerifyOrExit(!env->ExceptionCheck(), err = CHIP_JNI_ERROR_EXCEPTION_THROWN);
-
         env->CallVoidMethod(javaCallbackRef, javaMethod, static_cast<jint>(StatusCode), static_cast<jint>(FabricIndex),
-                            DebugTextArr);
-
-        env->DeleteLocalRef(DebugTextArr);
+                            DebugTextStr.jniValue());
 
     exit:
         if (err != CHIP_NO_ERROR)
@@ -6540,59 +5629,7 @@ class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<Sce
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime, chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t *  extensionFieldSets)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
-            UtfString sceneNameStr(env, sceneName);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPScenesClusterViewSceneResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(IIIILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , static_cast<jint>(groupId)
-                                , static_cast<jint>(sceneId)
-                                , static_cast<jint>(transitionTime)
-                                , sceneNameStr.jniValue()
-                // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPScenesClusterViewSceneResponseCallback()
@@ -6607,7 +5644,7 @@ class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<Sce
     };
 
     static void CallbackFn(void * context, uint8_t status, uint16_t groupId, uint8_t sceneId, uint16_t transitionTime,
-                           uint8_t * sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
+                           chip::CharSpan sceneName, /* TYPE WARNING: array array defaults to */ uint8_t * extensionFieldSets)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6615,8 +5652,7 @@ class CHIPScenesClusterViewSceneResponseCallback : public Callback::Callback<Sce
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPScenesClusterViewSceneResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString sceneNameStr(env, "");
+        UtfString sceneNameStr(env, sceneName);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -6741,54 +5777,7 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
-<<<<<<< HEAD
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
-
-        static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPTargetNavigatorClusterNavigateTargetResponseCallback * cppCallback = nullptr;
-            UtfString dataStr(env, data);
-            
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
-
-            cppCallback = reinterpret_cast<CHIPTargetNavigatorClusterNavigateTargetResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
-
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
-
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(ILjava/lang/String;)V", &javaMethod);
-            SuccessOrExit(err);
-
-
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                , static_cast<jint>(status)
-                                , dataStr.jniValue()
-            );
-
-
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
-=======
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
     ~CHIPTargetNavigatorClusterNavigateTargetResponseCallback()
@@ -6802,7 +5791,7 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
         env->DeleteGlobalRef(javaCallbackRef);
     };
 
-    static void CallbackFn(void * context, uint8_t status, uint8_t * data)
+    static void CallbackFn(void * context, uint8_t status, chip::CharSpan data)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -6810,8 +5799,7 @@ class CHIPTargetNavigatorClusterNavigateTargetResponseCallback
         jobject javaCallbackRef;
         jmethodID javaMethod;
         CHIPTargetNavigatorClusterNavigateTargetResponseCallback * cppCallback = nullptr;
-        // ByteSpan is not properly returned yet, temporarily use empty string
-        UtfString dataStr(env, "");
+        UtfString dataStr(env, data);
 
         VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
@@ -6911,6 +5899,7 @@ class CHIPTestClusterClusterTestAddArgumentsResponseCallback
     jobject javaCallbackRef;
 };
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 class CHIPTestClusterClusterTestEnumsResponseCallback : public Callback::Callback<TestClusterClusterTestEnumsResponseCallback>
 {
@@ -6985,70 +5974,78 @@ class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
 =======
 class CHIPTestClusterClusterTestListInt8UReverseResponseCallback : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
+    : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
+>>>>>>> 698449e64 (add recycler view to display endpoint)
 {
-    public:
-        CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback): Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>(CallbackFn, this)
+public:
+    CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback) :
+        Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
         {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
         }
-        ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-            env->DeleteGlobalRef(javaCallbackRef);
-        };
 
-        static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t *  arg1)
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
         {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-            jmethodID javaMethod;
-            CHIPTestClusterClusterTestListInt8UReverseResponseCallback * cppCallback = nullptr;
-
-            VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+    ~CHIPTestClusterClusterTestListInt8UReverseResponseCallback()
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+        env->DeleteGlobalRef(javaCallbackRef);
+    };
 
-            cppCallback = reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context);
-            VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
+    static void CallbackFn(void * context, /* TYPE WARNING: array array defaults to */ uint8_t * arg1)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+        jmethodID javaMethod;
+        CHIPTestClusterClusterTestListInt8UReverseResponseCallback * cppCallback = nullptr;
 
-            javaCallbackRef = cppCallback->javaCallbackRef;
-            VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
+        VerifyOrExit(env != nullptr, err = CHIP_JNI_ERROR_NO_ENV);
 
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
-            SuccessOrExit(err);
+        cppCallback = reinterpret_cast<CHIPTestClusterClusterTestListInt8UReverseResponseCallback *>(context);
+        VerifyOrExit(cppCallback != nullptr, err = CHIP_JNI_ERROR_NULL_OBJECT);
 
+        javaCallbackRef = cppCallback->javaCallbackRef;
+        VerifyOrExit(javaCallbackRef != nullptr, err = CHIP_NO_ERROR);
 
-            env->CallVoidMethod(javaCallbackRef, javaMethod
-                // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
-                // Conversion from this type to Java is not properly implemented yet
-            );
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "()V", &javaMethod);
+        SuccessOrExit(err);
 
+        env->CallVoidMethod(javaCallbackRef, javaMethod
+                            // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
+                            // Conversion from this type to Java is not properly implemented yet
+        );
 
-        exit:
-            if (err != CHIP_NO_ERROR) {
-                ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
-            }
-            if (cppCallback != nullptr) {
-                cppCallback->Cancel();
-                delete cppCallback;
-            }
+    exit:
+        if (err != CHIP_NO_ERROR)
+        {
+            ChipLogError(Zcl, "Error invoking Java callback: %" CHIP_ERROR_FORMAT, err.Format());
         }
-        
-    private:
-        jobject javaCallbackRef;
+        if (cppCallback != nullptr)
+        {
+            cppCallback->Cancel();
+            delete cppCallback;
+        }
+    }
+
+private:
+    jobject javaCallbackRef;
 };
 
 class CHIPTestClusterClusterTestNullableOptionalResponseCallback
@@ -7203,65 +6200,14 @@ class CHIPApplicationLauncherApplicationLauncherListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint16_t> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPApplicationLauncherApplicationLauncherListAttributeCallback> cppCallback(reinterpret_cast<CHIPApplicationLauncherApplicationLauncherListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, applicationLauncherList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ApplicationLauncherListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, uint16_t * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint16_t> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7293,14 +6239,19 @@ class CHIPApplicationLauncherApplicationLauncherListAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
             jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject applicationLauncherList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, applicationLauncherList);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding ApplicationLauncherListAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -7323,80 +6274,16 @@ class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callbac
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPAudioOutputAudioOutputListAttributeCallback> cppCallback(reinterpret_cast<CHIPAudioOutputAudioOutputListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(IILjava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint index = entry.index;
-                                jint outputType = entry.outputType;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    index, 
-                    outputType, 
-                    name
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _AudioOutputInfo * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::AudioOutput::Structs::AudioOutputInfo::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7436,21 +6323,26 @@ class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callbac
             ChipLogError(Zcl,
                          "Could not find class chip/devicecontroller/ChipClusters$AudioOutputCluster$AudioOutputListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find AudioOutputListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint index      = entries[i].index;
-            jint outputType = entries[i].outputType;
-            jbyteArray name = env->NewByteArray(entries[i].name.size());
-            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
+            auto & entry    = iter.GetValue();
+            jint index      = entry.index;
+            jint outputType = entry.outputType;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, outputType, name);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create AudioOutputListAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding AudioOutputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -7460,189 +6352,11 @@ class CHIPAudioOutputAudioOutputListAttributeCallback : public Callback::Callbac
     jobject javaCallbackRef;
 };
 
-<<<<<<< HEAD
 class CHIPBridgedActionsActionListAttributeCallback : public Callback::Callback<BridgedActionsActionListListAttributeCallback>
-{
-    public:
-        CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback): Callback::Callback<BridgedActionsActionListListAttributeCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
-        }
-
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & list)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback> cppCallback(reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(ILjava/lang/String;IIII)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ActionListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint actionID = entry.actionID;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-                jint type = entry.type;
-                                jint endpointListID = entry.endpointListID;
-                                jint supportedCommands = entry.supportedCommands;
-                                jint status = entry.status;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    actionID, 
-                    name, 
-                    type, 
-                    endpointListID, 
-                    supportedCommands, 
-                    status
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ActionListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActionListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-        }
-            
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPBridgedActionsEndpointListAttributeCallback : public Callback::Callback<BridgedActionsEndpointListListAttributeCallback>
-{
-    public:
-        CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback): Callback::Callback<BridgedActionsEndpointListListAttributeCallback>(CallbackFn, this)
-        {
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            if (env == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-                return;
-            }
-
-            javaCallbackRef = env->NewGlobalRef(javaCallback);
-            if (javaCallbackRef == nullptr) {
-                ChipLogError(Zcl, "Could not create global reference for Java callback");
-            }
-        }
-
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> & list)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback> cppCallback(reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(ILjava/lang/String;I[B)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find EndpointListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint endpointListID = entry.endpointListID;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-                jint type = entry.type;
-                                jbyteArray endpoints = env->NewByteArray(entry.endpoints.size());
-                env->SetByteArrayRegion(endpoints, 0, entry.endpoints.size(), reinterpret_cast<const jbyte *>(entry.endpoints.data()));
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    endpointListID, 
-                    name, 
-                    type, 
-                    endpoints
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create EndpointListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding EndpointListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-        }
-            
-    private:
-        jobject javaCallbackRef;
-};
-
-class CHIPContentLauncherAcceptsHeaderListAttributeCallback : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
-=======
-class CHIPContentLauncherAcceptsHeaderListAttributeCallback
-    : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
->>>>>>> b8d7ee0e3 (callback generation done)
 {
 public:
-    CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
+    CHIPBridgedActionsActionListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<BridgedActionsActionListListAttributeCallback>(CallbackFn, this)
     {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         if (env == nullptr)
@@ -7651,63 +6365,16 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ByteSpan> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jbyteArray acceptsHeaderList = env->NewByteArray(entry.size());
-                env->SetByteArrayRegion(acceptsHeaderList, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding AcceptsHeaderListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::ActionStruct::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7716,8 +6383,8 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback
 
         VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
+        std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPBridgedActionsActionListAttributeCallback *>(context));
 
         // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
         javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7739,12 +6406,37 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$ActionListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;IIII)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ActionListAttribute constructor"));
+
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jbyteArray acceptsHeaderList = env->NewByteArray(entries[i].size());
-            env->SetByteArrayRegion(acceptsHeaderList, 0, entries[i].size(), reinterpret_cast<const jbyte *>(entries[i].data()));
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
+            auto & entry  = iter.GetValue();
+            jint actionID = entry.actionID;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
+            jint type              = entry.type;
+            jint endpointListID    = entry.endpointListID;
+            jint supportedCommands = entry.supportedCommands;
+            jint status            = entry.status;
+
+            jobject attributeObj =
+                env->NewObject(attributeClass, attributeCtor, actionID, name, type, endpointListID, supportedCommands, status);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ActionListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ActionListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -7754,12 +6446,11 @@ class CHIPContentLauncherAcceptsHeaderListAttributeCallback
     jobject javaCallbackRef;
 };
 
-class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
-    : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
+class CHIPBridgedActionsEndpointListAttributeCallback : public Callback::Callback<BridgedActionsEndpointListListAttributeCallback>
 {
 public:
-    CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback) :
-        Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
+    CHIPBridgedActionsEndpointListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<BridgedActionsEndpointListListAttributeCallback>(CallbackFn, this)
     {
         JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
         if (env == nullptr)
@@ -7768,65 +6459,17 @@ class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding SupportedStreamingTypesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::BridgedActions::Structs::EndpointListStruct::DecodableType> &
+            list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -7835,8 +6478,8 @@ class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
 
         VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
 
-        std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(
-            reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
+        std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPBridgedActionsEndpointListAttributeCallback *>(context));
 
         // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
         javaCallbackRef = cppCallback.get()->javaCallbackRef;
@@ -7858,14 +6501,186 @@ class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        jclass attributeClass;
+        err = JniReferences::GetInstance().GetClassRef(
+            env, "chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute", attributeClass);
+        VerifyOrReturn(
+            err == CHIP_NO_ERROR,
+            ChipLogError(Zcl,
+                         "Could not find class chip/devicecontroller/ChipClusters$BridgedActionsCluster$EndpointListAttribute"));
+        JniClass attributeJniClass(attributeClass);
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;I[B)V");
+        VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find EndpointListAttribute constructor"));
+
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jclass entryTypeCls;
-            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
-            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
+            auto & entry        = iter.GetValue();
+            jint endpointListID = entry.endpointListID;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
+            jint type            = entry.type;
+            jbyteArray endpoints = env->NewByteArray(entry.endpoints.size());
+            env->SetByteArrayRegion(endpoints, 0, entry.endpoints.size(), reinterpret_cast<const jbyte *>(entry.endpoints.data()));
+
+            jobject attributeObj = env->NewObject(attributeClass, attributeCtor, endpointListID, name, type, endpoints);
+            VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create EndpointListAttribute object"));
+
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding EndpointListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPContentLauncherAcceptsHeaderListAttributeCallback
+    : public Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>
+{
+public:
+    CHIPContentLauncherAcceptsHeaderListAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherAcceptsHeaderListListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPContentLauncherAcceptsHeaderListAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPContentLauncherAcceptsHeaderListAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        auto iter = list.begin();
+        while (iter.Next())
+        {
+            auto & entry                 = iter.GetValue();
+            jbyteArray acceptsHeaderList = env->NewByteArray(entry.size());
+            env->SetByteArrayRegion(acceptsHeaderList, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, acceptsHeaderList);
+        }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding AcceptsHeaderListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
+
+        env->ExceptionClear();
+        env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
+    }
+
+private:
+    jobject javaCallbackRef;
+};
+
+class CHIPContentLauncherSupportedStreamingTypesAttributeCallback
+    : public Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>
+{
+public:
+    CHIPContentLauncherSupportedStreamingTypesAttributeCallback(jobject javaCallback) :
+        Callback::Callback<ContentLauncherSupportedStreamingTypesListAttributeCallback>(CallbackFn, this)
+    {
+        JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+        if (env == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+            return;
+        }
+
+        javaCallbackRef = env->NewGlobalRef(javaCallback);
+        if (javaCallbackRef == nullptr)
+        {
+            ChipLogError(Zcl, "Could not create global reference for Java callback");
+        }
+    }
+
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::ContentLauncher::ContentLaunchStreamingType> & list)
+    {
+        chip::DeviceLayer::StackUnlock unlock;
+        CHIP_ERROR err = CHIP_NO_ERROR;
+        JNIEnv * env   = JniReferences::GetInstance().GetEnvForCurrentThread();
+        jobject javaCallbackRef;
+
+        VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+
+        std::unique_ptr<CHIPContentLauncherSupportedStreamingTypesAttributeCallback> cppCallback(
+            reinterpret_cast<CHIPContentLauncherSupportedStreamingTypesAttributeCallback *>(context));
+
+        // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+        javaCallbackRef = cppCallback.get()->javaCallbackRef;
+        VerifyOrReturn(javaCallbackRef != nullptr,
+                       ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+        jclass arrayListClass;
+        err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
+        JniClass arrayListJniClass(arrayListClass);
+        jmethodID arrayListCtor      = env->GetMethodID(arrayListClass, "<init>", "()V");
+        jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
+        VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr,
+                       ChipLogError(Zcl, "Error finding Java ArrayList methods"));
+        jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
+        VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
+
+        jmethodID javaMethod;
+        err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
+        VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+        auto iter = list.begin();
+        while (iter.Next())
+        {
+            auto & entry = iter.GetValue();
+            jclass entryTypeCls;
+            JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
+            jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
+            jobject supportedStreamingTypes = env->NewObject(entryTypeCls, entryTypeCtor, entry);
+            env->CallBooleanMethod(arrayListObj, arrayListAddMethod, supportedStreamingTypes);
+        }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding SupportedStreamingTypesAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -7888,77 +6703,16 @@ class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<Desc
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPDescriptorDeviceListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorDeviceListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$DescriptorCluster$DeviceListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(JI)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find DeviceListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jlong type = entry.type;
-                                jint revision = entry.revision;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    type, 
-                    revision
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create DeviceListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding DeviceListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _DeviceType * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::Descriptor::Structs::DeviceType::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8000,16 +6754,21 @@ class CHIPDescriptorDeviceListAttributeCallback : public Callback::Callback<Desc
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JI)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find DeviceListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jlong type    = entries[i].type;
-            jint revision = entries[i].revision;
+            auto & entry  = iter.GetValue();
+            jlong type    = entry.type;
+            jint revision = entry.revision;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, type, revision);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create DeviceListAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding DeviceListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8032,65 +6791,14 @@ class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<Desc
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ClusterId> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPDescriptorServerListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorServerListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-                jobject serverList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, serverList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ServerListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8122,14 +6830,19 @@ class CHIPDescriptorServerListAttributeCallback : public Callback::Callback<Desc
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
             jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-            jobject serverList      = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject serverList      = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, serverList);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ServerListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8152,65 +6865,14 @@ class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<Desc
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ClusterId> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPDescriptorClientListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorClientListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-                jobject clientList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, clientList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ClientListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, chip::ClusterId * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ClusterId> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8242,14 +6904,19 @@ class CHIPDescriptorClientListAttributeCallback : public Callback::Callback<Desc
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Long", entryTypeCls);
             jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(J)V");
-            jobject clientList      = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject clientList      = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, clientList);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ClientListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8272,65 +6939,14 @@ class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<Descr
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::EndpointId> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPDescriptorPartsListAttributeCallback> cppCallback(reinterpret_cast<CHIPDescriptorPartsListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject partsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, partsList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding PartsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, chip::EndpointId * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::EndpointId> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8362,14 +6978,19 @@ class CHIPDescriptorPartsListAttributeCallback : public Callback::Callback<Descr
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
             jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject partsList       = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject partsList       = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, partsList);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding PartsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8392,79 +7013,16 @@ class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<Fixed
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPFixedLabelLabelListAttributeCallback> cppCallback(reinterpret_cast<CHIPFixedLabelLabelListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(Ljava/lang/String;Ljava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                UtfString labelStr(env, entry.label);
-                jstring label(labelStr.jniValue());
-                UtfString valueStr(env, entry.value);
-                jstring value(valueStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    label, 
-                    value
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _LabelStruct * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::FixedLabel::Structs::LabelStruct::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8503,21 +7061,26 @@ class CHIPFixedLabelLabelListAttributeCallback : public Callback::Callback<Fixed
             err == CHIP_NO_ERROR,
             ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$FixedLabelCluster$LabelListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "([B[B)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(Ljava/lang/String;Ljava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find LabelListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jbyteArray label = env->NewByteArray(entries[i].label.size());
-            env->SetByteArrayRegion(label, 0, entries[i].label.size(), reinterpret_cast<const jbyte *>(entries[i].label.data()));
-            jbyteArray value = env->NewByteArray(entries[i].value.size());
-            env->SetByteArrayRegion(value, 0, entries[i].value.size(), reinterpret_cast<const jbyte *>(entries[i].value.data()));
+            auto & entry = iter.GetValue();
+            UtfString labelStr(env, entry.label);
+            jstring label(labelStr.jniValue());
+            UtfString valueStr(env, entry.value);
+            jstring value(valueStr.jniValue());
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, label, value);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create LabelListAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding LabelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8541,75 +7104,17 @@ class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback> cppCallback(reinterpret_cast<CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GeneralCommissioningCluster$BasicCommissioningInfoListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(J)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find BasicCommissioningInfoListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jlong failSafeExpiryLengthMs = entry.failSafeExpiryLengthMs;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    failSafeExpiryLengthMs
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create BasicCommissioningInfoListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding BasicCommissioningInfoListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _BasicCommissioningInfoType * entries)
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<
+                   chip::app::Clusters::GeneralCommissioning::Structs::BasicCommissioningInfoType::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8655,9 +7160,11 @@ class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
         VerifyOrReturn(attributeCtor != nullptr,
                        ChipLogError(Zcl, "Could not find BasicCommissioningInfoListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jlong failSafeExpiryLengthMs = entries[i].FailSafeExpiryLengthMs;
+            auto & entry                 = iter.GetValue();
+            jlong failSafeExpiryLengthMs = entry.failSafeExpiryLengthMs;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, failSafeExpiryLengthMs);
             VerifyOrReturn(attributeObj != nullptr,
@@ -8665,6 +7172,9 @@ class CHIPGeneralCommissioningBasicCommissioningInfoListAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding BasicCommissioningInfoListAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8688,87 +7198,16 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback> cppCallback(reinterpret_cast<CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(Ljava/lang/String;ZZZ[BI)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NetworkInterfacesAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-                jboolean fabricConnected = entry.fabricConnected;
-                                jboolean offPremiseServicesReachableIPv4 = entry.offPremiseServicesReachableIPv4;
-                                jboolean offPremiseServicesReachableIPv6 = entry.offPremiseServicesReachableIPv6;
-                                jbyteArray hardwareAddress = env->NewByteArray(entry.hardwareAddress.size());
-                env->SetByteArrayRegion(hardwareAddress, 0, entry.hardwareAddress.size(), reinterpret_cast<const jbyte *>(entry.hardwareAddress.data()));
-                jint type = entry.type;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    name, 
-                    fabricConnected, 
-                    offPremiseServicesReachableIPv4, 
-                    offPremiseServicesReachableIPv6, 
-                    hardwareAddress, 
-                    type
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NetworkInterfacesAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding NetworkInterfacesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _NetworkInterfaceType * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8809,20 +7248,22 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
                 Zcl,
                 "Could not find class chip/devicecontroller/ChipClusters$GeneralDiagnosticsCluster$NetworkInterfacesAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "([BZZZ[BI)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(Ljava/lang/String;ZZZ[BI)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NetworkInterfacesAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jbyteArray name = env->NewByteArray(entries[i].Name.size());
-            env->SetByteArrayRegion(name, 0, entries[i].Name.size(), reinterpret_cast<const jbyte *>(entries[i].Name.data()));
-            jboolean fabricConnected                 = entries[i].FabricConnected;
-            jboolean offPremiseServicesReachableIPv4 = entries[i].OffPremiseServicesReachableIPv4;
-            jboolean offPremiseServicesReachableIPv6 = entries[i].OffPremiseServicesReachableIPv6;
-            jbyteArray hardwareAddress               = env->NewByteArray(entries[i].HardwareAddress.size());
-            env->SetByteArrayRegion(hardwareAddress, 0, entries[i].HardwareAddress.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].HardwareAddress.data()));
-            jint type = entries[i].Type;
+            auto & entry = iter.GetValue();
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
+            jboolean fabricConnected                 = entry.fabricConnected;
+            jboolean offPremiseServicesReachableIPv4 = entry.offPremiseServicesReachableIPv4;
+            jboolean offPremiseServicesReachableIPv6 = entry.offPremiseServicesReachableIPv6;
+            jbyteArray hardwareAddress               = env->NewByteArray(entry.hardwareAddress.size());
+            env->SetByteArrayRegion(hardwareAddress, 0, entry.hardwareAddress.size(),
+                                    reinterpret_cast<const jbyte *>(entry.hardwareAddress.data()));
+            jint type = entry.type;
 
             jobject attributeObj =
                 env->NewObject(attributeClass, attributeCtor, name, fabricConnected, offPremiseServicesReachableIPv4,
@@ -8831,6 +7272,9 @@ class CHIPGeneralDiagnosticsNetworkInterfacesAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding NetworkInterfacesAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -8853,79 +7297,17 @@ class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPGroupKeyManagementGroupsAttributeCallback> cppCallback(reinterpret_cast<CHIPGroupKeyManagementGroupsAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupsAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(III)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint vendorId = entry.vendorId;
-                                jint vendorGroupId = entry.vendorGroupId;
-                                jint groupKeySetIndex = entry.groupKeySetIndex;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    vendorId, 
-                    vendorGroupId, 
-                    groupKeySetIndex
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _GroupState * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupState::DecodableType> &
+            list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -8967,17 +7349,21 @@ class CHIPGroupKeyManagementGroupsAttributeCallback : public Callback::Callback<
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(III)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupsAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint vendorId         = entries[i].VendorId;
-            jint vendorGroupId    = entries[i].VendorGroupId;
-            jint groupKeySetIndex = entries[i].GroupKeySetIndex;
+            auto & entry          = iter.GetValue();
+            jint vendorId         = entry.vendorId;
+            jint vendorGroupId    = entry.vendorGroupId;
+            jint groupKeySetIndex = entry.groupKeySetIndex;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, vendorGroupId, groupKeySetIndex);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupsAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding GroupsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9000,84 +7386,16 @@ class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callba
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPGroupKeyManagementGroupKeysAttributeCallback> cppCallback(reinterpret_cast<CHIPGroupKeyManagementGroupKeysAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$GroupKeyManagementCluster$GroupKeysAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(II[BJI)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupKeysAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint vendorId = entry.vendorId;
-                                jint groupKeyIndex = entry.groupKeyIndex;
-                                jbyteArray groupKeyRoot = env->NewByteArray(entry.groupKeyRoot.size());
-                env->SetByteArrayRegion(groupKeyRoot, 0, entry.groupKeyRoot.size(), reinterpret_cast<const jbyte *>(entry.groupKeyRoot.data()));
-                jlong groupKeyEpochStartTime = entry.groupKeyEpochStartTime;
-                                jint groupKeySecurityPolicy = entry.groupKeySecurityPolicy;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    vendorId, 
-                    groupKeyIndex, 
-                    groupKeyRoot, 
-                    groupKeyEpochStartTime, 
-                    groupKeySecurityPolicy
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create GroupKeysAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding GroupKeysAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _GroupKey * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::GroupKeyManagement::Structs::GroupKey::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9120,15 +7438,17 @@ class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callba
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[BJI)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find GroupKeysAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint vendorId           = entries[i].VendorId;
-            jint groupKeyIndex      = entries[i].GroupKeyIndex;
-            jbyteArray groupKeyRoot = env->NewByteArray(entries[i].GroupKeyRoot.size());
-            env->SetByteArrayRegion(groupKeyRoot, 0, entries[i].GroupKeyRoot.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].GroupKeyRoot.data()));
-            jlong groupKeyEpochStartTime = entries[i].GroupKeyEpochStartTime;
-            jint groupKeySecurityPolicy  = entries[i].GroupKeySecurityPolicy;
+            auto & entry            = iter.GetValue();
+            jint vendorId           = entry.vendorId;
+            jint groupKeyIndex      = entry.groupKeyIndex;
+            jbyteArray groupKeyRoot = env->NewByteArray(entry.groupKeyRoot.size());
+            env->SetByteArrayRegion(groupKeyRoot, 0, entry.groupKeyRoot.size(),
+                                    reinterpret_cast<const jbyte *>(entry.groupKeyRoot.data()));
+            jlong groupKeyEpochStartTime = entry.groupKeyEpochStartTime;
+            jint groupKeySecurityPolicy  = entry.groupKeySecurityPolicy;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, vendorId, groupKeyIndex, groupKeyRoot,
                                                   groupKeyEpochStartTime, groupKeySecurityPolicy);
@@ -9136,6 +7456,9 @@ class CHIPGroupKeyManagementGroupKeysAttributeCallback : public Callback::Callba
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding GroupKeysAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9158,83 +7481,16 @@ class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPMediaInputMediaInputListAttributeCallback> cppCallback(reinterpret_cast<CHIPMediaInputMediaInputListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(IILjava/lang/String;Ljava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find MediaInputListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint index = entry.index;
-                                jint inputType = entry.inputType;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-                UtfString descriptionStr(env, entry.description);
-                jstring description(descriptionStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    index, 
-                    inputType, 
-                    name, 
-                    description
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create MediaInputListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding MediaInputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _MediaInputInfo * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::MediaInput::Structs::MediaInputInfo::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9273,24 +7529,28 @@ class CHIPMediaInputMediaInputListAttributeCallback : public Callback::Callback<
             err == CHIP_NO_ERROR,
             ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$MediaInputCluster$MediaInputListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B[B)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;Ljava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find MediaInputListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint index      = entries[i].index;
-            jint inputType  = entries[i].inputType;
-            jbyteArray name = env->NewByteArray(entries[i].name.size());
-            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
-            jbyteArray description = env->NewByteArray(entries[i].description.size());
-            env->SetByteArrayRegion(description, 0, entries[i].description.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].description.data()));
+            auto & entry   = iter.GetValue();
+            jint index     = entry.index;
+            jint inputType = entry.inputType;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
+            UtfString descriptionStr(env, entry.description);
+            jstring description(descriptionStr.jniValue());
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, index, inputType, name, description);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create MediaInputListAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding MediaInputListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9314,87 +7574,16 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPOperationalCredentialsFabricsListAttributeCallback> cppCallback(reinterpret_cast<CHIPOperationalCredentialsFabricsListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(I[BIJJLjava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint fabricIndex = entry.fabricIndex;
-                                jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
-                env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(), reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
-                jint vendorId = entry.vendorId;
-                                jlong fabricId = entry.fabricId;
-                                jlong nodeId = entry.nodeId;
-                                UtfString labelStr(env, entry.label);
-                jstring label(labelStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    fabricIndex, 
-                    rootPublicKey, 
-                    vendorId, 
-                    fabricId, 
-                    nodeId, 
-                    label
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create FabricsListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _FabricDescriptor * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9434,20 +7623,22 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback
             ChipLogError(
                 Zcl, "Could not find class chip/devicecontroller/ChipClusters$OperationalCredentialsCluster$FabricsListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[BIJJ[B)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[BIJJLjava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find FabricsListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint fabricIndex         = entries[i].FabricIndex;
-            jbyteArray rootPublicKey = env->NewByteArray(entries[i].RootPublicKey.size());
-            env->SetByteArrayRegion(rootPublicKey, 0, entries[i].RootPublicKey.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].RootPublicKey.data()));
-            jint vendorId    = entries[i].VendorId;
-            jlong fabricId   = entries[i].FabricId;
-            jlong nodeId     = entries[i].NodeId;
-            jbyteArray label = env->NewByteArray(entries[i].Label.size());
-            env->SetByteArrayRegion(label, 0, entries[i].Label.size(), reinterpret_cast<const jbyte *>(entries[i].Label.data()));
+            auto & entry             = iter.GetValue();
+            jint fabricIndex         = entry.fabricIndex;
+            jbyteArray rootPublicKey = env->NewByteArray(entry.rootPublicKey.size());
+            env->SetByteArrayRegion(rootPublicKey, 0, entry.rootPublicKey.size(),
+                                    reinterpret_cast<const jbyte *>(entry.rootPublicKey.data()));
+            jint vendorId  = entry.vendorId;
+            jlong fabricId = entry.fabricId;
+            jlong nodeId   = entry.nodeId;
+            UtfString labelStr(env, entry.label);
+            jstring label(labelStr.jniValue());
 
             jobject attributeObj =
                 env->NewObject(attributeClass, attributeCtor, fabricIndex, rootPublicKey, vendorId, fabricId, nodeId, label);
@@ -9455,6 +7646,9 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding FabricsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9560,65 +7754,14 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint8_t> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPPowerSourceActiveBatteryFaultsAttributeCallback> cppCallback(reinterpret_cast<CHIPPowerSourceActiveBatteryFaultsAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeBatteryFaults);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActiveBatteryFaultsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9650,14 +7793,19 @@ class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
             jmethodID entryTypeCtor     = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject activeBatteryFaults = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeBatteryFaults);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ActiveBatteryFaultsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9680,86 +7828,16 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPTvChannelTvChannelListAttributeCallback> cppCallback(reinterpret_cast<CHIPTvChannelTvChannelListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TvChannelListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint majorNumber = entry.majorNumber;
-                                jint minorNumber = entry.minorNumber;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-                UtfString callSignStr(env, entry.callSign);
-                jstring callSign(callSignStr.jniValue());
-                UtfString affiliateCallSignStr(env, entry.affiliateCallSign);
-                jstring affiliateCallSign(affiliateCallSignStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    majorNumber, 
-                    minorNumber, 
-                    name, 
-                    callSign, 
-                    affiliateCallSign
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TvChannelListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TvChannelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _TvChannelInfo * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TvChannel::Structs::TvChannelInfo::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9798,21 +7876,22 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
             err == CHIP_NO_ERROR,
             ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TvChannelCluster$TvChannelListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II[B[B[B)V");
+        jmethodID attributeCtor =
+            env->GetMethodID(attributeClass, "<init>", "(IILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TvChannelListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint majorNumber = entries[i].majorNumber;
-            jint minorNumber = entries[i].minorNumber;
-            jbyteArray name  = env->NewByteArray(entries[i].name.size());
-            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
-            jbyteArray callSign = env->NewByteArray(entries[i].callSign.size());
-            env->SetByteArrayRegion(callSign, 0, entries[i].callSign.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].callSign.data()));
-            jbyteArray affiliateCallSign = env->NewByteArray(entries[i].affiliateCallSign.size());
-            env->SetByteArrayRegion(affiliateCallSign, 0, entries[i].affiliateCallSign.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].affiliateCallSign.data()));
+            auto & entry     = iter.GetValue();
+            jint majorNumber = entry.majorNumber;
+            jint minorNumber = entry.minorNumber;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
+            UtfString callSignStr(env, entry.callSign);
+            jstring callSign(callSignStr.jniValue());
+            UtfString affiliateCallSignStr(env, entry.affiliateCallSign);
+            jstring affiliateCallSign(affiliateCallSignStr.jniValue());
 
             jobject attributeObj =
                 env->NewObject(attributeClass, attributeCtor, majorNumber, minorNumber, name, callSign, affiliateCallSign);
@@ -9820,6 +7899,9 @@ class CHIPTvChannelTvChannelListAttributeCallback : public Callback::Callback<Tv
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding TvChannelListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9843,78 +7925,16 @@ class CHIPTargetNavigatorTargetNavigatorListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPTargetNavigatorTargetNavigatorListAttributeCallback> cppCallback(reinterpret_cast<CHIPTargetNavigatorTargetNavigatorListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(ILjava/lang/String;)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint identifier = entry.identifier;
-                                UtfString nameStr(env, entry.name);
-                jstring name(nameStr.jniValue());
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    identifier, 
-                    name
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _NavigateTargetTargetInfo * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::TargetNavigator::Structs::NavigateTargetTargetInfo::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -9955,20 +7975,25 @@ class CHIPTargetNavigatorTargetNavigatorListAttributeCallback
                 Zcl,
                 "Could not find class chip/devicecontroller/ChipClusters$TargetNavigatorCluster$TargetNavigatorListAttribute"));
         JniClass attributeJniClass(attributeClass);
-        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(I[B)V");
+        jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(ILjava/lang/String;)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find TargetNavigatorListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint identifier = entries[i].identifier;
-            jbyteArray name = env->NewByteArray(entries[i].name.size());
-            env->SetByteArrayRegion(name, 0, entries[i].name.size(), reinterpret_cast<const jbyte *>(entries[i].name.data()));
+            auto & entry    = iter.GetValue();
+            jint identifier = entry.identifier;
+            UtfString nameStr(env, entry.name);
+            jstring name(nameStr.jniValue());
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, identifier, name);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create TargetNavigatorListAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding TargetNavigatorListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -9991,65 +8016,14 @@ class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<Test
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<uint8_t> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPTestClusterListInt8uAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListInt8uAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject listInt8u = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listInt8u);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListInt8uAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<uint8_t> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10081,14 +8055,19 @@ class CHIPTestClusterListInt8uAttributeCallback : public Callback::Callback<Test
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
             jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject listInt8u       = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject listInt8u       = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listInt8u);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ListInt8uAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10111,63 +8090,14 @@ class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callbac
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::ByteSpan> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPTestClusterListOctetStringAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListOctetStringAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jbyteArray listOctetString = env->NewByteArray(entry.size());
-                env->SetByteArrayRegion(listOctetString, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listOctetString);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, chip::ByteSpan * entries)
+    static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::ByteSpan> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10199,12 +8129,17 @@ class CHIPTestClusterListOctetStringAttributeCallback : public Callback::Callbac
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jbyteArray listOctetString = env->NewByteArray(entries[i].size());
-            env->SetByteArrayRegion(listOctetString, 0, entries[i].size(), reinterpret_cast<const jbyte *>(entries[i].data()));
+            auto & entry               = iter.GetValue();
+            jbyteArray listOctetString = env->NewByteArray(entry.size());
+            env->SetByteArrayRegion(listOctetString, 0, entry.size(), reinterpret_cast<const jbyte *>(entry.data()));
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, listOctetString);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding ListOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10228,78 +8163,17 @@ class CHIPTestClusterListStructOctetStringAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPTestClusterListStructOctetStringAttributeCallback> cppCallback(reinterpret_cast<CHIPTestClusterListStructOctetStringAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$TestClusterCluster$ListStructOctetStringAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(J[B)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ListStructOctetStringAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jlong fabricIndex = entry.fabricIndex;
-                                jbyteArray operationalCert = env->NewByteArray(entry.operationalCert.size());
-                env->SetByteArrayRegion(operationalCert, 0, entry.operationalCert.size(), reinterpret_cast<const jbyte *>(entry.operationalCert.data()));
-
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    fabricIndex, 
-                    operationalCert
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ListStructOctetStringAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ListStructOctetStringAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _TestListStructOctet * entries)
+    static void CallbackFn(
+        void * context,
+        const chip::app::DataModel::DecodableList<chip::app::Clusters::TestCluster::Structs::TestListStructOctet::DecodableType> &
+            list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10342,18 +8216,23 @@ class CHIPTestClusterListStructOctetStringAttributeCallback
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(J[B)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find ListStructOctetStringAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jlong fabricIndex          = entries[i].fabricIndex;
-            jbyteArray operationalCert = env->NewByteArray(entries[i].operationalCert.size());
-            env->SetByteArrayRegion(operationalCert, 0, entries[i].operationalCert.size(),
-                                    reinterpret_cast<const jbyte *>(entries[i].operationalCert.data()));
+            auto & entry               = iter.GetValue();
+            jlong fabricIndex          = entry.fabricIndex;
+            jbyteArray operationalCert = env->NewByteArray(entry.operationalCert.size());
+            env->SetByteArrayRegion(operationalCert, 0, entry.operationalCert.size(),
+                                    reinterpret_cast<const jbyte *>(entry.operationalCert.data()));
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, fabricIndex, operationalCert);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create ListStructOctetStringAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding ListStructOctetStringAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10377,101 +8256,16 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$NeighborTableListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(JJIJJIIIIIZZZZ)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NeighborTableListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jlong extAddress = entry.extAddress;
-                                jlong age = entry.age;
-                                jint rloc16 = entry.rloc16;
-                                jlong linkFrameCounter = entry.linkFrameCounter;
-                                jlong mleFrameCounter = entry.mleFrameCounter;
-                                jint lqi = entry.lqi;
-                                jint averageRssi = entry.averageRssi;
-                                jint lastRssi = entry.lastRssi;
-                                jint frameErrorRate = entry.frameErrorRate;
-                                jint messageErrorRate = entry.messageErrorRate;
-                                jboolean rxOnWhenIdle = entry.rxOnWhenIdle;
-                                jboolean fullThreadDevice = entry.fullThreadDevice;
-                                jboolean fullNetworkData = entry.fullNetworkData;
-                                jboolean isChild = entry.isChild;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    extAddress, 
-                    age, 
-                    rloc16, 
-                    linkFrameCounter, 
-                    mleFrameCounter, 
-                    lqi, 
-                    averageRssi, 
-                    lastRssi, 
-                    frameErrorRate, 
-                    messageErrorRate, 
-                    rxOnWhenIdle, 
-                    fullThreadDevice, 
-                    fullNetworkData, 
-                    isChild
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create NeighborTableListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding NeighborTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _NeighborTable * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::NeighborTable::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10515,22 +8309,24 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JJIJJIIIIIZZZZ)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find NeighborTableListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
-        {
-            jlong extAddress          = entries[i].ExtAddress;
-            jlong age                 = entries[i].Age;
-            jint rloc16               = entries[i].Rloc16;
-            jlong linkFrameCounter    = entries[i].LinkFrameCounter;
-            jlong mleFrameCounter     = entries[i].MleFrameCounter;
-            jint lqi                  = entries[i].LQI;
-            jint averageRssi          = entries[i].AverageRssi;
-            jint lastRssi             = entries[i].LastRssi;
-            jint frameErrorRate       = entries[i].FrameErrorRate;
-            jint messageErrorRate     = entries[i].MessageErrorRate;
-            jboolean rxOnWhenIdle     = entries[i].RxOnWhenIdle;
-            jboolean fullThreadDevice = entries[i].FullThreadDevice;
-            jboolean fullNetworkData  = entries[i].FullNetworkData;
-            jboolean isChild          = entries[i].IsChild;
+        auto iter = list.begin();
+        while (iter.Next())
+        {
+            auto & entry              = iter.GetValue();
+            jlong extAddress          = entry.extAddress;
+            jlong age                 = entry.age;
+            jint rloc16               = entry.rloc16;
+            jlong linkFrameCounter    = entry.linkFrameCounter;
+            jlong mleFrameCounter     = entry.mleFrameCounter;
+            jint lqi                  = entry.lqi;
+            jint averageRssi          = entry.averageRssi;
+            jint lastRssi             = entry.lastRssi;
+            jint frameErrorRate       = entry.frameErrorRate;
+            jint messageErrorRate     = entry.messageErrorRate;
+            jboolean rxOnWhenIdle     = entry.rxOnWhenIdle;
+            jboolean fullThreadDevice = entry.fullThreadDevice;
+            jboolean fullNetworkData  = entry.fullNetworkData;
+            jboolean isChild          = entry.isChild;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, age, rloc16, linkFrameCounter,
                                                   mleFrameCounter, lqi, averageRssi, lastRssi, frameErrorRate, messageErrorRate,
@@ -10539,6 +8335,9 @@ class CHIPThreadNetworkDiagnosticsNeighborTableListAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding NeighborTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10562,93 +8361,16 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$RouteTableListAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(JIIIIIIIZZ)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find RouteTableListAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jlong extAddress = entry.extAddress;
-                                jint rloc16 = entry.rloc16;
-                                jint routerId = entry.routerId;
-                                jint nextHop = entry.nextHop;
-                                jint pathCost = entry.pathCost;
-                                jint LQIIn = entry.LQIIn;
-                                jint LQIOut = entry.LQIOut;
-                                jint age = entry.age;
-                                jboolean allocated = entry.allocated;
-                                jboolean linkEstablished = entry.linkEstablished;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    extAddress, 
-                    rloc16, 
-                    routerId, 
-                    nextHop, 
-                    pathCost, 
-                    LQIIn, 
-                    LQIOut, 
-                    age, 
-                    allocated, 
-                    linkEstablished
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create RouteTableListAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding RouteTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _RouteTable * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::RouteTable::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10692,18 +8414,20 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(JIIIIIIIZZ)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find RouteTableListAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jlong extAddress         = entries[i].ExtAddress;
-            jint rloc16              = entries[i].Rloc16;
-            jint routerId            = entries[i].RouterId;
-            jint nextHop             = entries[i].NextHop;
-            jint pathCost            = entries[i].PathCost;
-            jint LQIIn               = entries[i].LQIIn;
-            jint LQIOut              = entries[i].LQIOut;
-            jint age                 = entries[i].Age;
-            jboolean allocated       = entries[i].Allocated;
-            jboolean linkEstablished = entries[i].LinkEstablished;
+            auto & entry             = iter.GetValue();
+            jlong extAddress         = entry.extAddress;
+            jint rloc16              = entry.rloc16;
+            jint routerId            = entry.routerId;
+            jint nextHop             = entry.nextHop;
+            jint pathCost            = entry.pathCost;
+            jint LQIIn               = entry.LQIIn;
+            jint LQIOut              = entry.LQIOut;
+            jint age                 = entry.age;
+            jboolean allocated       = entry.allocated;
+            jboolean linkEstablished = entry.linkEstablished;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, extAddress, rloc16, routerId, nextHop, pathCost,
                                                   LQIIn, LQIOut, age, allocated, linkEstablished);
@@ -10711,6 +8435,9 @@ class CHIPThreadNetworkDiagnosticsRouteTableListAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding RouteTableListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10734,77 +8461,16 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$SecurityPolicyAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(II)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find SecurityPolicyAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jint rotationTime = entry.rotationTime;
-                                jint flags = entry.flags;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    rotationTime, 
-                    flags
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create SecurityPolicyAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding SecurityPolicyAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _SecurityPolicy * entries)
+    static void CallbackFn(void * context,
+                           const chip::app::DataModel::DecodableList<
+                               chip::app::Clusters::ThreadNetworkDiagnostics::Structs::SecurityPolicy::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -10848,16 +8514,21 @@ class CHIPThreadNetworkDiagnosticsSecurityPolicyAttributeCallback
         jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>", "(II)V");
         VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find SecurityPolicyAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
-            jint rotationTime = entries[i].RotationTime;
-            jint flags        = entries[i].Flags;
+            auto & entry      = iter.GetValue();
+            jint rotationTime = entry.rotationTime;
+            jint flags        = entry.flags;
 
             jobject attributeObj = env->NewObject(attributeClass, attributeCtor, rotationTime, flags);
             VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create SecurityPolicyAttribute object"));
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(
+            iter.GetStatus() == CHIP_NO_ERROR,
+            ChipLogError(Zcl, "Error decoding SecurityPolicyAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -10881,97 +8552,17 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-            jclass attributeClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute", attributeClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find class chip/devicecontroller/ChipClusters$ThreadNetworkDiagnosticsCluster$OperationalDatasetComponentsAttribute"));
-            JniClass attributeJniClass(attributeClass);
-            jmethodID attributeCtor = env->GetMethodID(attributeClass, "<init>"
-                , "(ZZZZZZZZZZZZ)V");
-            VerifyOrReturn(attributeCtor != nullptr, ChipLogError(Zcl, "Could not find OperationalDatasetComponentsAttribute constructor"));
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jboolean activeTimestampPresent = entry.activeTimestampPresent;
-                                jboolean pendingTimestampPresent = entry.pendingTimestampPresent;
-                                jboolean masterKeyPresent = entry.masterKeyPresent;
-                                jboolean networkNamePresent = entry.networkNamePresent;
-                                jboolean extendedPanIdPresent = entry.extendedPanIdPresent;
-                                jboolean meshLocalPrefixPresent = entry.meshLocalPrefixPresent;
-                                jboolean delayPresent = entry.delayPresent;
-                                jboolean panIdPresent = entry.panIdPresent;
-                                jboolean channelPresent = entry.channelPresent;
-                                jboolean pskcPresent = entry.pskcPresent;
-                                jboolean securityPolicyPresent = entry.securityPolicyPresent;
-                                jboolean channelMaskPresent = entry.channelMaskPresent;
-                
-                jobject attributeObj = env->NewObject(attributeClass, attributeCtor,
-                    activeTimestampPresent, 
-                    pendingTimestampPresent, 
-                    masterKeyPresent, 
-                    networkNamePresent, 
-                    extendedPanIdPresent, 
-                    meshLocalPrefixPresent, 
-                    delayPresent, 
-                    panIdPresent, 
-                    channelPresent, 
-                    pskcPresent, 
-                    securityPolicyPresent, 
-                    channelMaskPresent
-                );
-                VerifyOrReturn(attributeObj != nullptr, ChipLogError(Zcl, "Could not create OperationalDatasetComponentsAttribute object"));
-
-                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding OperationalDatasetComponentsAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, _OperationalDatasetComponents * entries)
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<
+                   chip::app::Clusters::ThreadNetworkDiagnostics::Structs::OperationalDatasetComponents::DecodableType> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11018,20 +8609,22 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
         VerifyOrReturn(attributeCtor != nullptr,
                        ChipLogError(Zcl, "Could not find OperationalDatasetComponentsAttribute constructor"));
 
-        for (uint16_t i = 0; i < count; i++)
-        {
-            jboolean activeTimestampPresent  = entries[i].ActiveTimestampPresent;
-            jboolean pendingTimestampPresent = entries[i].PendingTimestampPresent;
-            jboolean masterKeyPresent        = entries[i].MasterKeyPresent;
-            jboolean networkNamePresent      = entries[i].NetworkNamePresent;
-            jboolean extendedPanIdPresent    = entries[i].ExtendedPanIdPresent;
-            jboolean meshLocalPrefixPresent  = entries[i].MeshLocalPrefixPresent;
-            jboolean delayPresent            = entries[i].DelayPresent;
-            jboolean panIdPresent            = entries[i].PanIdPresent;
-            jboolean channelPresent          = entries[i].ChannelPresent;
-            jboolean pskcPresent             = entries[i].PskcPresent;
-            jboolean securityPolicyPresent   = entries[i].SecurityPolicyPresent;
-            jboolean channelMaskPresent      = entries[i].ChannelMaskPresent;
+        auto iter = list.begin();
+        while (iter.Next())
+        {
+            auto & entry                     = iter.GetValue();
+            jboolean activeTimestampPresent  = entry.activeTimestampPresent;
+            jboolean pendingTimestampPresent = entry.pendingTimestampPresent;
+            jboolean masterKeyPresent        = entry.masterKeyPresent;
+            jboolean networkNamePresent      = entry.networkNamePresent;
+            jboolean extendedPanIdPresent    = entry.extendedPanIdPresent;
+            jboolean meshLocalPrefixPresent  = entry.meshLocalPrefixPresent;
+            jboolean delayPresent            = entry.delayPresent;
+            jboolean panIdPresent            = entry.panIdPresent;
+            jboolean channelPresent          = entry.channelPresent;
+            jboolean pskcPresent             = entry.pskcPresent;
+            jboolean securityPolicyPresent   = entry.securityPolicyPresent;
+            jboolean channelMaskPresent      = entry.channelMaskPresent;
 
             jobject attributeObj =
                 env->NewObject(attributeClass, attributeCtor, activeTimestampPresent, pendingTimestampPresent, masterKeyPresent,
@@ -11042,6 +8635,9 @@ class CHIPThreadNetworkDiagnosticsOperationalDatasetComponentsAttributeCallback
 
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, attributeObj);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding OperationalDatasetComponentsAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -11065,65 +8661,16 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
             return;
         }
 
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
-=======
-<<<<<<< HEAD
-        static void CallbackFn(void * context, const app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
->>>>>>> b8d7ee0e3 (callback generation done)
-        {
-            chip::DeviceLayer::StackUnlock unlock;
-            CHIP_ERROR err = CHIP_NO_ERROR;
-            JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
-            jobject javaCallbackRef;
-
-            VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
-
-            std::unique_ptr<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback> cppCallback(reinterpret_cast<CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback *>(context));
-
-            // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
-            javaCallbackRef = cppCallback.get()->javaCallbackRef;
-            VerifyOrReturn(javaCallbackRef != nullptr, ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
-
-            jclass arrayListClass;
-            err = JniReferences::GetInstance().GetClassRef(env, "java/util/ArrayList", arrayListClass);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error using Java ArrayList"));
-            JniClass arrayListJniClass(arrayListClass);
-            jmethodID arrayListCtor = env->GetMethodID(arrayListClass, "<init>", "()V");
-            jmethodID arrayListAddMethod = env->GetMethodID(arrayListClass, "add", "(Ljava/lang/Object;)Z");
-            VerifyOrReturn(arrayListCtor != nullptr && arrayListAddMethod != nullptr, ChipLogError(Zcl, "Error finding Java ArrayList methods"));
-            jobject arrayListObj = env->NewObject(arrayListClass, arrayListCtor);
-            VerifyOrReturn(arrayListObj != nullptr, ChipLogError(Zcl, "Error creating Java ArrayList"));
-
-            jmethodID javaMethod;
-            err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
-            VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
-
-
-            auto iter = list.begin();
-            while (iter.Next())
-            {
-                auto & entry = iter.GetValue();
-                jclass entryTypeCls;
-                JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
-                jmethodID entryTypeCtor = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-                jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
-                                env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeNetworkFaultsList);
-            }
-            VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR, ChipLogError(Zcl, "Error decoding ActiveNetworkFaultsListAttribute value: %" CHIP_ERROR_FORMAT, iter.GetStatus().Format()));
-
-            env->ExceptionClear();
-            env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
-=======
         javaCallbackRef = env->NewGlobalRef(javaCallback);
         if (javaCallbackRef == nullptr)
         {
             ChipLogError(Zcl, "Could not create global reference for Java callback");
->>>>>>> e993d01f0 (callback generation done)
         }
     }
 
-    static void CallbackFn(void * context, uint16_t count, uint8_t * entries)
+    static void
+    CallbackFn(void * context,
+               const chip::app::DataModel::DecodableList<chip::app::Clusters::ThreadNetworkDiagnostics::NetworkFault> & list)
     {
         chip::DeviceLayer::StackUnlock unlock;
         CHIP_ERROR err = CHIP_NO_ERROR;
@@ -11155,14 +8702,19 @@ class CHIPThreadNetworkDiagnosticsActiveNetworkFaultsListAttributeCallback
         err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/util/List;)V", &javaMethod);
         VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
 
-        for (uint16_t i = 0; i < count; i++)
+        auto iter = list.begin();
+        while (iter.Next())
         {
+            auto & entry = iter.GetValue();
             jclass entryTypeCls;
             JniReferences::GetInstance().GetClassRef(env, "java/lang/Integer", entryTypeCls);
             jmethodID entryTypeCtor         = env->GetMethodID(entryTypeCls, "<init>", "(I)V");
-            jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entries[i]);
+            jobject activeNetworkFaultsList = env->NewObject(entryTypeCls, entryTypeCtor, entry);
             env->CallBooleanMethod(arrayListObj, arrayListAddMethod, activeNetworkFaultsList);
         }
+        VerifyOrReturn(iter.GetStatus() == CHIP_NO_ERROR,
+                       ChipLogError(Zcl, "Error decoding ActiveNetworkFaultsListAttribute value: %" CHIP_ERROR_FORMAT,
+                                    iter.GetStatus().Format()));
 
         env->ExceptionClear();
         env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
@@ -11212,13 +8764,8 @@ JNI_METHOD(void, AccountLoginCluster, getSetupPIN)
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())));
-=======
-    err =
-        cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(),
-                                chip::ByteSpan((const uint8_t *) tempAccountIdentifier, strlen(tempAccountIdentifierStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+    err = cppCluster->GetSetupPIN(onSuccess->Cancel(), onFailure->Cancel(),
+                                  chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -11268,13 +8815,9 @@ JNI_METHOD(void, AccountLoginCluster, login)
     cppCluster = reinterpret_cast<AccountLoginCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())), chip::CharSpan(setupPINStr.c_str(), strlen(setupPINStr.c_str())));
-=======
     err = cppCluster->Login(onSuccess->Cancel(), onFailure->Cancel(),
-                            chip::ByteSpan((const uint8_t *) tempAccountIdentifier, strlen(tempAccountIdentifierStr.c_str())),
-                            chip::ByteSpan((const uint8_t *) setupPIN, strlen(setupPINStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                            chip::CharSpan(tempAccountIdentifierStr.c_str(), strlen(tempAccountIdentifierStr.c_str())),
+                            chip::CharSpan(setupPINStr.c_str(), strlen(setupPINStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -11803,13 +9346,8 @@ JNI_METHOD(void, ApplicationLauncherCluster, launchApp)
     cppCluster = reinterpret_cast<ApplicationLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())), catalogVendorId, chip::CharSpan(applicationIdStr.c_str(), strlen(applicationIdStr.c_str())));
-=======
-    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(),
-                                chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())), catalogVendorId,
-                                chip::ByteSpan((const uint8_t *) applicationId, strlen(applicationIdStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+    err = cppCluster->LaunchApp(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())),
+                                catalogVendorId, chip::CharSpan(applicationIdStr.c_str(), strlen(applicationIdStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -11973,12 +9511,8 @@ JNI_METHOD(void, AudioOutputCluster, renameOutput)
     cppCluster = reinterpret_cast<AudioOutputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
-=======
     err = cppCluster->RenameOutput(onSuccess->Cancel(), onFailure->Cancel(), index,
-                                   chip::ByteSpan((const uint8_t *) name, strlen(nameStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                   chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -12589,12 +10123,8 @@ JNI_METHOD(void, BasicCluster, writeUserLabelAttribute)
                    ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-<<<<<<< HEAD
-    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
-=======
     err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                              chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                              chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -12646,12 +10176,8 @@ JNI_METHOD(void, BasicCluster, writeLocationAttribute)
                    ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-<<<<<<< HEAD
-    err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
-=======
     err = cppCluster->WriteAttributeLocation(onSuccess->Cancel(), onFailure->Cancel(),
-                                             chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                             chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -13377,19 +10903,23 @@ JNI_METHOD(jlong, BooleanStateCluster, initWithDevice)(JNIEnv * env, jobject sel
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-
 JNI_METHOD(void, BooleanStateCluster, readStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onSuccess(
+        Platform::New<CHIPBooleanAttributeCallback>(callback), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13398,20 +10928,27 @@ JNI_METHOD(void, BooleanStateCluster, readStateValueAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributeStateValue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                   static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
@@ -13421,15 +10958,19 @@ JNI_METHOD(void, BooleanStateCluster, subscribeStateValueAttribute)(JNIEnv * env
 JNI_METHOD(void, BooleanStateCluster, reportStateValueAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPBooleanAttributeCallback, void (*)(CHIPBooleanAttributeCallback *)> onReport(
+        Platform::New<CHIPBooleanAttributeCallback>(callback, true), Platform::Delete<CHIPBooleanAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributeStateValue(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
@@ -13437,15 +10978,20 @@ JNI_METHOD(void, BooleanStateCluster, reportStateValueAttribute)(JNIEnv * env, j
 JNI_METHOD(void, BooleanStateCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     BooleanStateCluster * cppCluster = reinterpret_cast<BooleanStateCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13462,15 +11008,17 @@ JNI_METHOD(jlong, BridgedActionsCluster, initWithDevice)(JNIEnv * env, jobject s
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-JNI_METHOD(void, BridgedActionsCluster, disableAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, disableAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13480,37 +11028,44 @@ JNI_METHOD(void, BridgedActionsCluster, disableAction)(JNIEnv * env, jobject sel
     err = cppCluster->DisableAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13520,37 +11075,44 @@ JNI_METHOD(void, BridgedActionsCluster, disableActionWithDuration)(JNIEnv * env,
     err = cppCluster->DisableActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, enableAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, enableAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13560,37 +11122,44 @@ JNI_METHOD(void, BridgedActionsCluster, enableAction)(JNIEnv * env, jobject self
     err = cppCluster->EnableAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13600,37 +11169,44 @@ JNI_METHOD(void, BridgedActionsCluster, enableActionWithDuration)(JNIEnv * env,
     err = cppCluster->EnableActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, instantAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, instantAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13640,37 +11216,44 @@ JNI_METHOD(void, BridgedActionsCluster, instantAction)(JNIEnv * env, jobject sel
     err = cppCluster->InstantAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jint transitionTime)
+JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jint transitionTime)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13680,37 +11263,44 @@ JNI_METHOD(void, BridgedActionsCluster, instantActionWithTransition)(JNIEnv * en
     err = cppCluster->InstantActionWithTransition(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, transitionTime);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, pauseAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, pauseAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13720,37 +11310,44 @@ JNI_METHOD(void, BridgedActionsCluster, pauseAction)(JNIEnv * env, jobject self,
     err = cppCluster->PauseAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13760,37 +11357,44 @@ JNI_METHOD(void, BridgedActionsCluster, pauseActionWithDuration)(JNIEnv * env, j
     err = cppCluster->PauseActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, resumeAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, resumeAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13800,37 +11404,44 @@ JNI_METHOD(void, BridgedActionsCluster, resumeAction)(JNIEnv * env, jobject self
     err = cppCluster->ResumeAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, startAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, startAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13840,37 +11451,44 @@ JNI_METHOD(void, BridgedActionsCluster, startAction)(JNIEnv * env, jobject self,
     err = cppCluster->StartAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
+JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID, jlong duration)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13880,37 +11498,44 @@ JNI_METHOD(void, BridgedActionsCluster, startActionWithDuration)(JNIEnv * env, j
     err = cppCluster->StartActionWithDuration(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID, duration);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, BridgedActionsCluster, stopAction)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
+JNI_METHOD(void, BridgedActionsCluster, stopAction)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint actionID, jlong invokeID)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -13920,24 +11545,29 @@ JNI_METHOD(void, BridgedActionsCluster, stopAction)(JNIEnv * env, jobject self,
     err = cppCluster->StopAction(onSuccess->Cancel(), onFailure->Cancel(), actionID, invokeID);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -13946,16 +11576,21 @@ JNI_METHOD(void, BridgedActionsCluster, stopAction)(JNIEnv * env, jobject self,
 JNI_METHOD(void, BridgedActionsCluster, readActionListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback, void (*)(CHIPBridgedActionsActionListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBridgedActionsActionListAttributeCallback>(callback), Platform::Delete<CHIPBridgedActionsActionListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBridgedActionsActionListAttributeCallback, void (*)(CHIPBridgedActionsActionListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPBridgedActionsActionListAttributeCallback>(callback),
+                  Platform::Delete<CHIPBridgedActionsActionListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeActionList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13967,16 +11602,21 @@ JNI_METHOD(void, BridgedActionsCluster, readActionListAttribute)(JNIEnv * env, j
 JNI_METHOD(void, BridgedActionsCluster, readEndpointListAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback, void (*)(CHIPBridgedActionsEndpointListAttributeCallback *)> onSuccess(
-        Platform::New<CHIPBridgedActionsEndpointListAttributeCallback>(callback), Platform::Delete<CHIPBridgedActionsEndpointListAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPBridgedActionsEndpointListAttributeCallback, void (*)(CHIPBridgedActionsEndpointListAttributeCallback *)>
+        onSuccess(Platform::New<CHIPBridgedActionsEndpointListAttributeCallback>(callback),
+                  Platform::Delete<CHIPBridgedActionsEndpointListAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeEndpointList(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -13988,16 +11628,20 @@ JNI_METHOD(void, BridgedActionsCluster, readEndpointListAttribute)(JNIEnv * env,
 JNI_METHOD(void, BridgedActionsCluster, readSetupUrlAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(Platform::New<CHIPCharStringAttributeCallback>(callback,
-        false), Platform::Delete<CHIPCharStringAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPCharStringAttributeCallback, void (*)(CHIPCharStringAttributeCallback *)> onSuccess(
+        Platform::New<CHIPCharStringAttributeCallback>(callback, false), Platform::Delete<CHIPCharStringAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSetupUrl(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14006,18 +11650,24 @@ JNI_METHOD(void, BridgedActionsCluster, readSetupUrlAttribute)(JNIEnv * env, job
     onFailure.release();
 }
 
-JNI_METHOD(void, BridgedActionsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, BridgedActionsCluster, readClusterRevisionAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                     = CHIP_NO_ERROR;
     BridgedActionsCluster * cppCluster = reinterpret_cast<BridgedActionsCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeClusterRevision(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -14155,12 +11805,8 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, writeUserLabelAttribute)
                    ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-<<<<<<< HEAD
-    err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
-=======
     err = cppCluster->WriteAttributeUserLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                              chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                              chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -17409,12 +15055,8 @@ JNI_METHOD(void, ContentLauncherCluster, launchContent)
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
-=======
     err = cppCluster->LaunchContent(onSuccess->Cancel(), onFailure->Cancel(), autoPlay,
-                                    chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                    chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -17466,13 +15108,9 @@ JNI_METHOD(void, ContentLauncherCluster, launchURL)
     cppCluster = reinterpret_cast<ContentLauncherCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(contentURLStr.c_str(), strlen(contentURLStr.c_str())), chip::CharSpan(displayStringStr.c_str(), strlen(displayStringStr.c_str())));
-=======
     err = cppCluster->LaunchURL(onSuccess->Cancel(), onFailure->Cancel(),
-                                chip::ByteSpan((const uint8_t *) contentURL, strlen(contentURLStr.c_str())),
-                                chip::ByteSpan((const uint8_t *) displayString, strlen(displayStringStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                chip::CharSpan(contentURLStr.c_str(), strlen(contentURLStr.c_str())),
+                                chip::CharSpan(displayStringStr.c_str(), strlen(displayStringStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -17740,16 +15378,12 @@ JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
 
     JniByteArray transferFileDesignatorArr(env, transferFileDesignator);
 
-<<<<<<< HEAD
-    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback, void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)> onSuccess(
-        Platform::New<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>(callback), Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-=======
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
-        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback,
+                    void (*)(CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback *)>
+        onSuccess(Platform::New<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>(callback),
+                  Platform::Delete<CHIPDiagnosticLogsClusterRetrieveLogsResponseCallback>);
     std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
         Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
->>>>>>> b8d7ee0e3 (callback generation done)
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -20064,6 +17698,7 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
     cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(location),
@@ -20075,11 +17710,16 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
 =======
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
 =======
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location,
-                                          chip::ByteSpan((const uint8_t *) countryCode, strlen(countryCodeStr.c_str())), breadcrumb,
+                                          chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb,
                                           timeoutMs);
+<<<<<<< HEAD
 >>>>>>> b8d7ee0e3 (callback generation done)
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -20495,12 +18135,8 @@ JNI_METHOD(void, GroupsCluster, addGroup)
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
-=======
     err = cppCluster->AddGroup(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-                               chip::ByteSpan((const uint8_t *) groupName, strlen(groupNameStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                               chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -20549,12 +18185,8 @@ JNI_METHOD(void, GroupsCluster, addGroupIfIdentifying)
     cppCluster = reinterpret_cast<GroupsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId, chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
-=======
     err = cppCluster->AddGroupIfIdentifying(onSuccess->Cancel(), onFailure->Cancel(), groupId,
-                                            chip::ByteSpan((const uint8_t *) groupName, strlen(groupNameStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                            chip::CharSpan(groupNameStr.c_str(), strlen(groupNameStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -21841,15 +19473,20 @@ JNI_METHOD(void, LevelControlCluster, reportCurrentLevelAttribute)(JNIEnv * env,
 JNI_METHOD(void, LevelControlCluster, readRemainingTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeRemainingTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21861,15 +19498,20 @@ JNI_METHOD(void, LevelControlCluster, readRemainingTimeAttribute)(JNIEnv * env,
 JNI_METHOD(void, LevelControlCluster, readMinLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21881,15 +19523,20 @@ JNI_METHOD(void, LevelControlCluster, readMinLevelAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, LevelControlCluster, readMaxLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21901,15 +19548,20 @@ JNI_METHOD(void, LevelControlCluster, readMaxLevelAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, LevelControlCluster, readCurrentFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeCurrentFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21921,15 +19573,20 @@ JNI_METHOD(void, LevelControlCluster, readCurrentFrequencyAttribute)(JNIEnv * en
 JNI_METHOD(void, LevelControlCluster, readMinFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21941,15 +19598,20 @@ JNI_METHOD(void, LevelControlCluster, readMinFrequencyAttribute)(JNIEnv * env, j
 JNI_METHOD(void, LevelControlCluster, readMaxFrequencyAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxFrequency(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21961,15 +19623,20 @@ JNI_METHOD(void, LevelControlCluster, readMaxFrequencyAttribute)(JNIEnv * env, j
 JNI_METHOD(void, LevelControlCluster, readOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOptions(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -21978,38 +19645,50 @@ JNI_METHOD(void, LevelControlCluster, readOptionsAttribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOptionsAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOptions(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22018,21 +19697,27 @@ JNI_METHOD(void, LevelControlCluster, readOnOffTransitionTimeAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22041,15 +19726,20 @@ JNI_METHOD(void, LevelControlCluster, writeOnOffTransitionTimeAttribute)(JNIEnv
 JNI_METHOD(void, LevelControlCluster, readOnLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22058,21 +19748,27 @@ JNI_METHOD(void, LevelControlCluster, readOnLevelAttribute)(JNIEnv * env, jobjec
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22081,15 +19777,20 @@ JNI_METHOD(void, LevelControlCluster, writeOnLevelAttribute)(JNIEnv * env, jobje
 JNI_METHOD(void, LevelControlCluster, readOnTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOnTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22098,38 +19799,50 @@ JNI_METHOD(void, LevelControlCluster, readOnTransitionTimeAttribute)(JNIEnv * en
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOnTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOnTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22138,21 +19851,27 @@ JNI_METHOD(void, LevelControlCluster, readOffTransitionTimeAttribute)(JNIEnv * e
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeOffTransitionTime(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22161,15 +19880,20 @@ JNI_METHOD(void, LevelControlCluster, writeOffTransitionTimeAttribute)(JNIEnv *
 JNI_METHOD(void, LevelControlCluster, readDefaultMoveRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeDefaultMoveRate(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22178,38 +19902,50 @@ JNI_METHOD(void, LevelControlCluster, readDefaultMoveRateAttribute)(JNIEnv * env
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeDefaultMoveRateAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeDefaultMoveRate(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeStartUpCurrentLevel(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -22218,21 +19954,27 @@ JNI_METHOD(void, LevelControlCluster, readStartUpCurrentLevelAttribute)(JNIEnv *
     onFailure.release();
 }
 
-JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, LevelControlCluster, writeStartUpCurrentLevelAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                   = CHIP_NO_ERROR;
     LevelControlCluster * cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeStartUpCurrentLevel(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
@@ -22416,12 +20158,8 @@ JNI_METHOD(void, MediaInputCluster, renameInput)
     cppCluster = reinterpret_cast<MediaInputCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index, chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
-=======
     err = cppCluster->RenameInput(onSuccess->Cancel(), onFailure->Cancel(), index,
-                                  chip::ByteSpan((const uint8_t *) name, strlen(nameStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                  chip::CharSpan(nameStr.c_str(), strlen(nameStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -24055,6 +21793,7 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
@@ -24067,12 +21806,17 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
 =======
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
 =======
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
-                                 protocolsSupported, chip::ByteSpan((const uint8_t *) location, strlen(locationStr.c_str())),
+                                 protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())),
                                  requestorCanConsent,
                                  chip::ByteSpan((const uint8_t *) metadataForProviderArr.data(), metadataForProviderArr.size()));
+<<<<<<< HEAD
 >>>>>>> b8d7ee0e3 (callback generation done)
 >>>>>>> 677ef48a5 (callback generation done)
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -25573,12 +23317,8 @@ JNI_METHOD(void, OperationalCredentialsCluster, updateFabricLabel)
     cppCluster = reinterpret_cast<OperationalCredentialsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(labelStr.c_str(), strlen(labelStr.c_str())));
-=======
     err = cppCluster->UpdateFabricLabel(onSuccess->Cancel(), onFailure->Cancel(),
-                                        chip::ByteSpan((const uint8_t *) label, strlen(labelStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                        chip::CharSpan(labelStr.c_str(), strlen(labelStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -26368,19 +24108,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxFlowAttribute)
     onFailure.release();
 }
 
-<<<<<<< HEAD
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26389,18 +24134,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstPressureAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26409,18 +24160,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstPressureAttribu
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinCompPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26429,18 +24186,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinCompPressureAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxCompPressure(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26449,18 +24212,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxCompPressureAttribut
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26469,18 +24238,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26489,18 +24264,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstSpeedAttribute)
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26509,18 +24290,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstFlowAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstFlow(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26529,18 +24316,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstFlowAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMinConstTemp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26549,18 +24342,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMinConstTempAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16sAttributeCallback, void (*)(CHIPInt16sAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16sAttributeCallback>(callback), Platform::Delete<CHIPInt16sAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeMaxConstTemp(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26569,18 +24368,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readMaxConstTempAttribute)(
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26589,47 +24394,56 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readPumpStatusAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribePumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, subscribePumpStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint minInterval, jint maxInterval)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
-    err = cppCluster->SubscribeAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval), static_cast<uint16_t>(maxInterval));
+    err = cppCluster->SubscribeAttributePumpStatus(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint16_t>(minInterval),
+                                                   static_cast<uint16_t>(maxInterval));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error subscribing to attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, reportPumpStatusAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, reportPumpStatusAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onReport.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
-    
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onReport(
+        Platform::New<CHIPInt16uAttributeCallback>(callback, true), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onReport.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native report callback", CHIP_ERROR_NO_MEMORY));
+
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReportAttributePumpStatus(onReport->Cancel());
-    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR,
+                   ReturnIllegalStateException(env, callback, "Error registering for attribute reporting", err));
 
     onReport.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readEffectiveOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
@@ -26754,19 +24568,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, reportCapacityAttribute)
     onReport.release();
 }
 
-<<<<<<< HEAD
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeSpeed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26775,18 +24594,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readSpeedAttribute)(JNIEnv
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeLifetimeEnergyConsumed(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26795,11 +24620,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readLifetimeEnergyConsumedA
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readOperationModeAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
@@ -26850,19 +24672,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, writeOperationModeAttribute
     onFailure.release();
 }
 
-<<<<<<< HEAD
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt8uAttributeCallback>(callback), Platform::Delete<CHIPInt8uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeControlMode(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26871,38 +24698,50 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readControlModeAttribute)(J
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, writeControlModeAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint value)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->WriteAttributeControlMode(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(value));
-        VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
+    VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt16uAttributeCallback>(callback), Platform::Delete<CHIPInt16uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeAlarmMask(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26911,18 +24750,24 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readAlarmMaskAttribute)(JNI
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
+JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
-    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
-    VerifyOrReturn(onSuccess.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPInt32uAttributeCallback, void (*)(CHIPInt32uAttributeCallback *)> onSuccess(
+        Platform::New<CHIPInt32uAttributeCallback>(callback), Platform::Delete<CHIPInt32uAttributeCallback>);
+    VerifyOrReturn(onSuccess.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native success callback", CHIP_ERROR_NO_MEMORY));
 
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
-    VerifyOrReturn(onFailure.get() != nullptr, ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    VerifyOrReturn(onFailure.get() != nullptr,
+                   ReturnIllegalStateException(env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY));
 
-    CHIP_ERROR err = CHIP_NO_ERROR;
+    CHIP_ERROR err                                  = CHIP_NO_ERROR;
     PumpConfigurationAndControlCluster * cppCluster = reinterpret_cast<PumpConfigurationAndControlCluster *>(clusterPtr);
-    VerifyOrReturn(cppCluster != nullptr, ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
+    VerifyOrReturn(cppCluster != nullptr,
+                   ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     err = cppCluster->ReadAttributeFeatureMap(onSuccess->Cancel(), onFailure->Cancel());
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error reading attribute", err));
@@ -26931,11 +24776,8 @@ JNI_METHOD(void, PumpConfigurationAndControlCluster, readFeatureMapAttribute)(JN
     onFailure.release();
 }
 
-JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
 JNI_METHOD(void, PumpConfigurationAndControlCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e993d01f0 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
@@ -27232,12 +25074,8 @@ JNI_METHOD(void, ScenesCluster, addScene)
     cppCluster = reinterpret_cast<ScenesCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime, chip::CharSpan(sceneNameStr.c_str(), strlen(sceneNameStr.c_str())), clusterId, length, value);
-=======
     err = cppCluster->AddScene(onSuccess->Cancel(), onFailure->Cancel(), groupId, sceneId, transitionTime,
-                               chip::ByteSpan((const uint8_t *) sceneName, strlen(sceneNameStr.c_str())), clusterId, length, value);
->>>>>>> b8d7ee0e3 (callback generation done)
+                               chip::CharSpan(sceneNameStr.c_str(), strlen(sceneNameStr.c_str())), clusterId, length, value);
     SuccessOrExit(err);
 
 exit:
@@ -28021,12 +25859,8 @@ JNI_METHOD(void, TvChannelCluster, changeChannel)(JNIEnv * env, jobject self, jl
     cppCluster = reinterpret_cast<TvChannelCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(matchStr.c_str(), strlen(matchStr.c_str())));
-=======
     err = cppCluster->ChangeChannel(onSuccess->Cancel(), onFailure->Cancel(),
-                                    chip::ByteSpan((const uint8_t *) match, strlen(matchStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                    chip::CharSpan(matchStr.c_str(), strlen(matchStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -28280,12 +26114,8 @@ JNI_METHOD(void, TargetNavigatorCluster, navigateTarget)
     cppCluster = reinterpret_cast<TargetNavigatorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-    err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target, chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
-=======
     err = cppCluster->NavigateTarget(onSuccess->Cancel(), onFailure->Cancel(), target,
-                                     chip::ByteSpan((const uint8_t *) data, strlen(dataStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                     chip::CharSpan(dataStr.c_str(), strlen(dataStr.c_str())));
     SuccessOrExit(err);
 
 exit:
@@ -28717,6 +26547,7 @@ JNI_METHOD(void, TestClusterCluster, testAddArguments)
     }
 }
 <<<<<<< HEAD
+<<<<<<< HEAD
 JNI_METHOD(void, TestClusterCluster, testEnumsRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
@@ -28771,14 +26602,19 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
 =======
 JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
+>>>>>>> 698449e64 (add recycler view to display endpoint)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28788,38 +26624,46 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)(JNIEnv * env,
     err = cppCluster->TestListInt8UArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), arg1);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
+JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
 
-    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback, void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)> onSuccess(
-        Platform::New<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>(callback), Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+    std::unique_ptr<CHIPTestClusterClusterTestListInt8UReverseResponseCallback,
+                    void (*)(CHIPTestClusterClusterTestListInt8UReverseResponseCallback *)>
+        onSuccess(Platform::New<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>(callback),
+                  Platform::Delete<CHIPTestClusterClusterTestListInt8UReverseResponseCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
@@ -28829,45 +26673,54 @@ JNI_METHOD(void, TestClusterCluster, testListInt8UReverseRequest)(JNIEnv * env,
     err = cppCluster->TestListInt8UReverseRequest(onSuccess->Cancel(), onFailure->Cancel(), arg1);
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
+JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
+
     JniByteArray dArr(env, d);
     JniUtfString eStr(env, e);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                     chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
@@ -28875,26 +26728,36 @@ JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)(JNIEnv * env
 =======
     err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c,
+                                                    chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
+                                                    chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -29042,23 +26905,27 @@ JNI_METHOD(void, TestClusterCluster, testSpecific)(JNIEnv * env, jobject self, j
         onFailure.release();
     }
 }
-JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
+JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)
+(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint a, jboolean b, jint c, jbyteArray d, jstring e, jint f)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     TestClusterCluster * cppCluster;
-    
+
     JniByteArray dArr(env, d);
     JniUtfString eStr(env, e);
-    
-    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
-    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
+
+    std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
+        Platform::New<CHIPDefaultSuccessCallback>(callback), Platform::Delete<CHIPDefaultSuccessCallback>);
+    std::unique_ptr<CHIPDefaultFailureCallback, void (*)(CHIPDefaultFailureCallback *)> onFailure(
+        Platform::New<CHIPDefaultFailureCallback>(callback), Platform::Delete<CHIPDefaultFailureCallback>);
     VerifyOrExit(onSuccess.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
     VerifyOrExit(onFailure.get() != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
     err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                 chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
@@ -29066,26 +26933,36 @@ JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)(JNIEnv * env, jo
 =======
     err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
 >>>>>>> e83b94d19 (need to wait for cast-helper)
+=======
+    err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c,
+                                                chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
+                                                chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
-exit: 
-    if (err != CHIP_NO_ERROR) {
+exit:
+    if (err != CHIP_NO_ERROR)
+    {
         jthrowable exception;
         jmethodID method;
 
         err = JniReferences::GetInstance().FindMethod(env, callback, "onError", "(Ljava/lang/Exception;)V", &method);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
 
         err = CreateIllegalStateException(env, "Error invoking cluster", err, exception);
-        if (err != CHIP_NO_ERROR) {
+        if (err != CHIP_NO_ERROR)
+        {
             ChipLogError(Zcl, "Error throwing IllegalStateException %" CHIP_ERROR_FORMAT, err.Format());
             return;
         }
         env->CallVoidMethod(callback, method, exception);
-    } else {
+    }
+    else
+    {
         onSuccess.release();
         onFailure.release();
     }
@@ -30133,12 +28010,8 @@ JNI_METHOD(void, TestClusterCluster, writeCharStringAttribute)
                    ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-<<<<<<< HEAD
-    err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
-=======
     err = cppCluster->WriteAttributeCharString(onSuccess->Cancel(), onFailure->Cancel(),
-                                               chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                               chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
@@ -30190,12 +28063,8 @@ JNI_METHOD(void, TestClusterCluster, writeLongCharStringAttribute)
                    ReturnIllegalStateException(env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE));
 
     JniUtfString valueStr(env, value);
-<<<<<<< HEAD
-    err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(), chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
-=======
     err = cppCluster->WriteAttributeLongCharString(onSuccess->Cancel(), onFailure->Cancel(),
-                                                   chip::ByteSpan((const uint8_t *) valueStr.c_str(), strlen(valueStr.c_str())));
->>>>>>> b8d7ee0e3 (callback generation done)
+                                                   chip::CharSpan(valueStr.c_str(), strlen(valueStr.c_str())));
     VerifyOrReturn(err == CHIP_NO_ERROR, ReturnIllegalStateException(env, callback, "Error writing attribute", err));
 
     onSuccess.release();
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 6df0cb9f27d6d7..322470d3ca00ee 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -363,21 +363,10 @@ private native void selectOutput(
 
     public static class AudioOutputListAttribute {
       public int index;
-<<<<<<< HEAD
-            public int outputType;
-            public String name;
-
-      public AudioOutputListAttribute(
-        int index,
-                int outputType,
-                String name
-      ) {
-=======
       public int outputType;
-      public byte[] name;
+      public String name;
 
-      public AudioOutputListAttribute(int index, int outputType, byte[] name) {
->>>>>>> e993d01f0 (callback generation done)
+      public AudioOutputListAttribute(int index, int outputType, String name) {
         this.index = index;
         this.outputType = outputType;
         this.name = name;
@@ -789,14 +778,12 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-
-    public void readStateValueAttribute(
-      BooleanAttributeCallback callback
-    ) {
+    public void readStateValueAttribute(BooleanAttributeCallback callback) {
       readStateValueAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribeStateValueAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribeStateValueAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribeStateValueAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -804,23 +791,21 @@ public void reportStateValueAttribute(BooleanAttributeCallback callback) {
       reportStateValueAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readStateValueAttribute(long chipClusterPtr,
-      BooleanAttributeCallback callback
-    );
 
-    private native void subscribeStateValueAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+    private native void readStateValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void subscribeStateValueAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
-    private native void reportStateValueAttribute(long chipClusterPtr, BooleanAttributeCallback callback);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void reportStateValueAttribute(
+        long chipClusterPtr, BooleanAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BridgedActionsCluster extends BaseChipCluster {
@@ -839,90 +824,126 @@ public void disableAction(DefaultClusterCallback callback, int actionID, long in
       disableAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
-    public void disableActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+    public void disableActionWithDuration(
+        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       disableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
-
     public void enableAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       enableAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
-    public void enableActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+    public void enableActionWithDuration(
+        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       enableActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
-
     public void instantAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       instantAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
-    public void instantActionWithTransition(DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime) {
+    public void instantActionWithTransition(
+        DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime) {
       instantActionWithTransition(chipClusterPtr, callback, actionID, invokeID, transitionTime);
     }
 
-
     public void pauseAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       pauseAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
-    public void pauseActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+    public void pauseActionWithDuration(
+        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       pauseActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
-
     public void resumeAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       resumeAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
     public void startAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       startAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-
-    public void startActionWithDuration(DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
+    public void startActionWithDuration(
+        DefaultClusterCallback callback, int actionID, long invokeID, long duration) {
       startActionWithDuration(chipClusterPtr, callback, actionID, invokeID, duration);
     }
 
-
     public void stopAction(DefaultClusterCallback callback, int actionID, long invokeID) {
       stopAction(chipClusterPtr, callback, actionID, invokeID);
     }
 
-    private native void disableAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void disableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
-    private native void enableAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void enableActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
-    private native void instantAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void instantActionWithTransition(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, int transitionTime);
-    private native void pauseAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void pauseActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
-    private native void resumeAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void startAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
-    private native void startActionWithDuration(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID, long duration);
-    private native void stopAction(long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+    private native void disableAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void disableActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int actionID,
+        long invokeID,
+        long duration);
+
+    private native void enableAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void enableActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int actionID,
+        long invokeID,
+        long duration);
+
+    private native void instantAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void instantActionWithTransition(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int actionID,
+        long invokeID,
+        int transitionTime);
+
+    private native void pauseAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void pauseActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int actionID,
+        long invokeID,
+        long duration);
+
+    private native void resumeAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void startAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
+
+    private native void startActionWithDuration(
+        long chipClusterPtr,
+        DefaultClusterCallback callback,
+        int actionID,
+        long invokeID,
+        long duration);
+
+    private native void stopAction(
+        long chipClusterPtr, DefaultClusterCallback callback, int actionID, long invokeID);
 
     public static class ActionListAttribute {
       public int actionID;
-            public String name;
+      public String name;
       public int type;
-            public int endpointListID;
-            public int supportedCommands;
-            public int status;
-      
+      public int endpointListID;
+      public int supportedCommands;
+      public int status;
+
       public ActionListAttribute(
-        int actionID,
-                String name,
-        int type,
-                int endpointListID,
-                int supportedCommands,
-                int status
-              ) {
+          int actionID,
+          String name,
+          int type,
+          int endpointListID,
+          int supportedCommands,
+          int status) {
         this.actionID = actionID;
         this.name = name;
         this.type = type;
@@ -933,23 +954,18 @@ public ActionListAttribute(
     }
 
     public interface ActionListAttributeCallback {
-      void onSuccess(List<
-      ActionListAttribute
-      > valueList);
+      void onSuccess(List<ActionListAttribute> valueList);
+
       void onError(Exception ex);
     }
+
     public static class EndpointListAttribute {
       public int endpointListID;
-            public String name;
+      public String name;
       public int type;
-            public byte[] endpoints;
-
-      public EndpointListAttribute(
-        int endpointListID,
-                String name,
-        int type,
-                byte[] endpoints
-      ) {
+      public byte[] endpoints;
+
+      public EndpointListAttribute(int endpointListID, String name, int type, byte[] endpoints) {
         this.endpointListID = endpointListID;
         this.name = name;
         this.type = type;
@@ -958,51 +974,38 @@ public EndpointListAttribute(
     }
 
     public interface EndpointListAttributeCallback {
-      void onSuccess(List<
-      EndpointListAttribute
-      > valueList);
+      void onSuccess(List<EndpointListAttribute> valueList);
+
       void onError(Exception ex);
     }
 
-    public void readActionListAttribute(
-      ActionListAttributeCallback callback
-    ) {
+    public void readActionListAttribute(ActionListAttributeCallback callback) {
       readActionListAttribute(chipClusterPtr, callback);
     }
 
-    public void readEndpointListAttribute(
-      EndpointListAttributeCallback callback
-    ) {
+    public void readEndpointListAttribute(EndpointListAttributeCallback callback) {
       readEndpointListAttribute(chipClusterPtr, callback);
     }
 
-    public void readSetupUrlAttribute(
-      CharStringAttributeCallback callback
-    ) {
+    public void readSetupUrlAttribute(CharStringAttributeCallback callback) {
       readSetupUrlAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
-  
-    private native void readActionListAttribute(long chipClusterPtr,
-      ActionListAttributeCallback callback
-    );
-  
-    private native void readEndpointListAttribute(long chipClusterPtr,
-      EndpointListAttributeCallback callback
-    );
-  
-    private native void readSetupUrlAttribute(long chipClusterPtr,
-      CharStringAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+
+    private native void readActionListAttribute(
+        long chipClusterPtr, ActionListAttributeCallback callback);
+
+    private native void readEndpointListAttribute(
+        long chipClusterPtr, EndpointListAttributeCallback callback);
+
+    private native void readSetupUrlAttribute(
+        long chipClusterPtr, CharStringAttributeCallback callback);
+
+    private native void readClusterRevisionAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
   }
 
   public static class BridgedDeviceBasicCluster extends BaseChipCluster {
@@ -2268,27 +2271,8 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-<<<<<<< HEAD
-    public void retrieveLogsRequest(RetrieveLogsResponseCallback callback, int intent, int requestedProtocol, byte[] transferFileDesignator) {
-      retrieveLogsRequest(chipClusterPtr, callback, intent, requestedProtocol, transferFileDesignator);
-    }
-
-    private native void retrieveLogsRequest(long chipClusterPtr, RetrieveLogsResponseCallback callback, int intent, int requestedProtocol, byte[] transferFileDesignator);
-    public interface RetrieveLogsResponseCallback {
-      void onSuccess(
-      int status
-      , byte[] content
-      , long timeStamp
-      , long timeSinceBoot
-      );
-      
-      void onError(Exception error);
-    }
-
-
-=======
     public void retrieveLogsRequest(
-        DefaultClusterCallback callback,
+        RetrieveLogsResponseCallback callback,
         int intent,
         int requestedProtocol,
         byte[] transferFileDesignator) {
@@ -2298,11 +2282,16 @@ public void retrieveLogsRequest(
 
     private native void retrieveLogsRequest(
         long chipClusterPtr,
-        DefaultClusterCallback callback,
+        RetrieveLogsResponseCallback callback,
         int intent,
         int requestedProtocol,
         byte[] transferFileDesignator);
->>>>>>> b8d7ee0e3 (callback generation done)
+
+    public interface RetrieveLogsResponseCallback {
+      void onSuccess(int status, byte[] content, long timeStamp, long timeSinceBoot);
+
+      void onError(Exception error);
+    }
   }
 
   public static class DoorLockCluster extends BaseChipCluster {
@@ -2313,7 +2302,7 @@ public DoorLockCluster(long devicePtr, int endpointId) {
     public static long clusterId() {
       return Long.parseUnsignedLong("257");
     }
-    src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
@@ -2964,14 +2953,7 @@ public static class LabelListAttribute {
       public String label;
       public String value;
 
-<<<<<<< HEAD
-      public LabelListAttribute(
-        String label,
-        String value
-      ) {
-=======
-      public LabelListAttribute(byte[] label, byte[] value) {
->>>>>>> e993d01f0 (callback generation done)
+      public LabelListAttribute(String label, String value) {
         this.label = label;
         this.value = value;
       }
@@ -3222,22 +3204,12 @@ public static class NetworkInterfacesAttribute {
       public int type;
 
       public NetworkInterfacesAttribute(
-<<<<<<< HEAD
-        String name,
-        boolean fabricConnected,
-                boolean offPremiseServicesReachableIPv4,
-                boolean offPremiseServicesReachableIPv6,
-                byte[] hardwareAddress,
-        int type
-              ) {
-=======
-          byte[] name,
+          String name,
           boolean fabricConnected,
           boolean offPremiseServicesReachableIPv4,
           boolean offPremiseServicesReachableIPv6,
           byte[] hardwareAddress,
           int type) {
->>>>>>> e993d01f0 (callback generation done)
         this.name = name;
         this.fabricConnected = fabricConnected;
         this.offPremiseServicesReachableIPv4 = offPremiseServicesReachableIPv4;
@@ -3765,56 +3737,31 @@ public void reportCurrentLevelAttribute(IntegerAttributeCallback callback) {
       reportCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-    public void readRemainingTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f00108887 (merge conflict)
     public void readRemainingTimeAttribute(IntegerAttributeCallback callback) {
->>>>>>> e993d01f0 (callback generation done)
       readRemainingTimeAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinLevelAttribute(IntegerAttributeCallback callback) {
       readMinLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxLevelAttribute(IntegerAttributeCallback callback) {
       readMaxLevelAttribute(chipClusterPtr, callback);
     }
 
-    public void readCurrentFrequencyAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readCurrentFrequencyAttribute(IntegerAttributeCallback callback) {
       readCurrentFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinFrequencyAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinFrequencyAttribute(IntegerAttributeCallback callback) {
       readMinFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxFrequencyAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxFrequencyAttribute(IntegerAttributeCallback callback) {
       readMaxFrequencyAttribute(chipClusterPtr, callback);
     }
 
-    public void readOptionsAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOptionsAttribute(IntegerAttributeCallback callback) {
       readOptionsAttribute(chipClusterPtr, callback);
     }
 
@@ -3822,9 +3769,7 @@ public void writeOptionsAttribute(DefaultClusterCallback callback, int value) {
       writeOptionsAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnOffTransitionTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOnOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
       readOnOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3832,9 +3777,7 @@ public void writeOnOffTransitionTimeAttribute(DefaultClusterCallback callback, i
       writeOnOffTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOnLevelAttribute(IntegerAttributeCallback callback) {
       readOnLevelAttribute(chipClusterPtr, callback);
     }
 
@@ -3842,9 +3785,7 @@ public void writeOnLevelAttribute(DefaultClusterCallback callback, int value) {
       writeOnLevelAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOnTransitionTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOnTransitionTimeAttribute(IntegerAttributeCallback callback) {
       readOnTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3852,9 +3793,7 @@ public void writeOnTransitionTimeAttribute(DefaultClusterCallback callback, int
       writeOnTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readOffTransitionTimeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readOffTransitionTimeAttribute(IntegerAttributeCallback callback) {
       readOffTransitionTimeAttribute(chipClusterPtr, callback);
     }
 
@@ -3862,9 +3801,7 @@ public void writeOffTransitionTimeAttribute(DefaultClusterCallback callback, int
       writeOffTransitionTimeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readDefaultMoveRateAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readDefaultMoveRateAttribute(IntegerAttributeCallback callback) {
       readDefaultMoveRateAttribute(chipClusterPtr, callback);
     }
 
@@ -3872,9 +3809,7 @@ public void writeDefaultMoveRateAttribute(DefaultClusterCallback callback, int v
       writeDefaultMoveRateAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readStartUpCurrentLevelAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readStartUpCurrentLevelAttribute(IntegerAttributeCallback callback) {
       readStartUpCurrentLevelAttribute(chipClusterPtr, callback);
     }
 
@@ -3882,47 +3817,13 @@ public void writeStartUpCurrentLevelAttribute(DefaultClusterCallback callback, i
       writeStartUpCurrentLevelAttribute(chipClusterPtr, callback, value);
     }
 
-<<<<<<< HEAD
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
-<<<<<<< HEAD
-=======
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
-=======
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> f00108887 (merge conflict)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
     private native void readCurrentLevelAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
->>>>>>> 6e6e45a1a (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
     private native void subscribeCurrentLevelAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -3991,122 +3892,29 @@ private native void writeStartUpCurrentLevelAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-<<<<<<< HEAD
-=======
-=======
->>>>>>> d51f00a65 (need to wait for cast-helper)
->>>>>>> e993d01f0 (callback generation done)
-    private native void reportCurrentLevelAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readRemainingTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCurrentFrequencyAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinFrequencyAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxFrequencyAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readOptionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+  }
 
-    private native void writeOptionsAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOnOffTransitionTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+  public static class LowPowerCluster extends BaseChipCluster {
+    public LowPowerCluster(long devicePtr, int endpointId) {
+      super(devicePtr, endpointId);
+    }
 
-    private native void writeOnOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOnLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    public static long clusterId() {
+      return Long.parseUnsignedLong("1288");
+    }
 
-    private native void writeOnLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOnTransitionTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    @Override
+    public native long initWithDevice(long devicePtr, int endpointId);
 
-    private native void writeOnTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readOffTransitionTimeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    public void sleep(DefaultClusterCallback callback) {
+      sleep(chipClusterPtr, callback);
+    }
 
-    private native void writeOffTransitionTimeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readDefaultMoveRateAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
+    private native void sleep(long chipClusterPtr, DefaultClusterCallback callback);
 
-    private native void writeDefaultMoveRateAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readStartUpCurrentLevelAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-
-    private native void writeStartUpCurrentLevelAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
-  }
-
-  public static class LowPowerCluster extends BaseChipCluster {
-    public LowPowerCluster(long devicePtr, int endpointId) {
-      super(devicePtr, endpointId);
-    }
-
-    public static long clusterId() {
-      return Long.parseUnsignedLong("1288");
-    }
-
-    @Override
-    public native long initWithDevice(long devicePtr, int endpointId);
-
-    public void sleep(DefaultClusterCallback callback) {
-      sleep(chipClusterPtr, callback);
-    }
-
-    private native void sleep(long chipClusterPtr, DefaultClusterCallback callback);
-
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
+    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
+      readClusterRevisionAttribute(chipClusterPtr, callback);
+    }
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
@@ -4152,24 +3960,11 @@ private native void selectInput(
 
     public static class MediaInputListAttribute {
       public int index;
-<<<<<<< HEAD
-            public int inputType;
-            public String name;
-      public String description;
-
-      public MediaInputListAttribute(
-        int index,
-                int inputType,
-                String name,
-        String description
-      ) {
-=======
       public int inputType;
-      public byte[] name;
-      public byte[] description;
+      public String name;
+      public String description;
 
-      public MediaInputListAttribute(int index, int inputType, byte[] name, byte[] description) {
->>>>>>> e993d01f0 (callback generation done)
+      public MediaInputListAttribute(int index, int inputType, String name, String description) {
         this.index = index;
         this.inputType = inputType;
         this.name = name;
@@ -5149,17 +4944,8 @@ public interface CertificateChainResponseCallback {
     }
 
     public interface NOCResponseCallback {
-<<<<<<< HEAD
-      void onSuccess(
-      int StatusCode
-      , int FabricIndex
-      , String DebugText
-      );
-      
-=======
-      void onSuccess(int StatusCode, int FabricIndex, byte[] DebugText);
+      void onSuccess(int StatusCode, int FabricIndex, String DebugText);
 
->>>>>>> e993d01f0 (callback generation done)
       void onError(Exception error);
     }
 
@@ -5173,23 +4959,9 @@ public static class FabricsListAttribute {
       public int fabricIndex;
       public byte[] rootPublicKey;
       public int vendorId;
-<<<<<<< HEAD
-            public long fabricId;
-            public long nodeId;
-            public String label;
-
-      public FabricsListAttribute(
-        int fabricIndex,
-                byte[] rootPublicKey,
-        int vendorId,
-                long fabricId,
-                long nodeId,
-                String label
-      ) {
-=======
       public long fabricId;
       public long nodeId;
-      public byte[] label;
+      public String label;
 
       public FabricsListAttribute(
           int fabricIndex,
@@ -5197,8 +4969,7 @@ public FabricsListAttribute(
           int vendorId,
           long fabricId,
           long nodeId,
-          byte[] label) {
->>>>>>> e993d01f0 (callback generation done)
+          String label) {
         this.fabricIndex = fabricIndex;
         this.rootPublicKey = rootPublicKey;
         this.vendorId = vendorId;
@@ -5490,74 +5261,52 @@ public void readMaxFlowAttribute(IntegerAttributeCallback callback) {
       readMaxFlowAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-    public void readMinConstPressureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinConstPressureAttribute(IntegerAttributeCallback callback) {
       readMinConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstPressureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxConstPressureAttribute(IntegerAttributeCallback callback) {
       readMaxConstPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinCompPressureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinCompPressureAttribute(IntegerAttributeCallback callback) {
       readMinCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxCompPressureAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxCompPressureAttribute(IntegerAttributeCallback callback) {
       readMaxCompPressureAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstSpeedAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinConstSpeedAttribute(IntegerAttributeCallback callback) {
       readMinConstSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstSpeedAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxConstSpeedAttribute(IntegerAttributeCallback callback) {
       readMaxConstSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstFlowAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinConstFlowAttribute(IntegerAttributeCallback callback) {
       readMinConstFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstFlowAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxConstFlowAttribute(IntegerAttributeCallback callback) {
       readMaxConstFlowAttribute(chipClusterPtr, callback);
     }
 
-    public void readMinConstTempAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMinConstTempAttribute(IntegerAttributeCallback callback) {
       readMinConstTempAttribute(chipClusterPtr, callback);
     }
 
-    public void readMaxConstTempAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readMaxConstTempAttribute(IntegerAttributeCallback callback) {
       readMaxConstTempAttribute(chipClusterPtr, callback);
     }
 
-    public void readPumpStatusAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readPumpStatusAttribute(IntegerAttributeCallback callback) {
       readPumpStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void subscribePumpStatusAttribute(DefaultClusterCallback callback, int minInterval, int maxInterval) {
+    public void subscribePumpStatusAttribute(
+        DefaultClusterCallback callback, int minInterval, int maxInterval) {
       subscribePumpStatusAttribute(chipClusterPtr, callback, minInterval, maxInterval);
     }
 
@@ -5565,12 +5314,7 @@ public void reportPumpStatusAttribute(IntegerAttributeCallback callback) {
       reportPumpStatusAttribute(chipClusterPtr, callback);
     }
 
-    public void readEffectiveOperationModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
-=======
     public void readEffectiveOperationModeAttribute(IntegerAttributeCallback callback) {
->>>>>>> e993d01f0 (callback generation done)
       readEffectiveOperationModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5591,25 +5335,15 @@ public void reportCapacityAttribute(IntegerAttributeCallback callback) {
       reportCapacityAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-    public void readSpeedAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readSpeedAttribute(IntegerAttributeCallback callback) {
       readSpeedAttribute(chipClusterPtr, callback);
     }
 
-    public void readLifetimeEnergyConsumedAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readLifetimeEnergyConsumedAttribute(LongAttributeCallback callback) {
       readLifetimeEnergyConsumedAttribute(chipClusterPtr, callback);
     }
 
-    public void readOperationModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
-=======
     public void readOperationModeAttribute(IntegerAttributeCallback callback) {
->>>>>>> e993d01f0 (callback generation done)
       readOperationModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5617,10 +5351,7 @@ public void writeOperationModeAttribute(DefaultClusterCallback callback, int val
       writeOperationModeAttribute(chipClusterPtr, callback, value);
     }
 
-<<<<<<< HEAD
-    public void readControlModeAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readControlModeAttribute(IntegerAttributeCallback callback) {
       readControlModeAttribute(chipClusterPtr, callback);
     }
 
@@ -5628,145 +5359,66 @@ public void writeControlModeAttribute(DefaultClusterCallback callback, int value
       writeControlModeAttribute(chipClusterPtr, callback, value);
     }
 
-    public void readAlarmMaskAttribute(
-      IntegerAttributeCallback callback
-    ) {
+    public void readAlarmMaskAttribute(IntegerAttributeCallback callback) {
       readAlarmMaskAttribute(chipClusterPtr, callback);
     }
 
-    public void readFeatureMapAttribute(
-      LongAttributeCallback callback
-    ) {
+    public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-  
-    private native void readMaxPressureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxSpeedAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxFlowAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinConstPressureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxConstPressureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinCompPressureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxCompPressureAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinConstSpeedAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxConstSpeedAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinConstFlowAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxConstFlowAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinConstTempAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxConstTempAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readPumpStatusAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-
-    private native void subscribePumpStatusAttribute(long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
-
-    private native void reportPumpStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readEffectiveOperationModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readEffectiveControlModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCapacityAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-=======
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
->>>>>>> e993d01f0 (callback generation done)
 
     private native void readMaxPressureAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-    private native void reportCapacityAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readSpeedAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readLifetimeEnergyConsumedAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readOperationModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-
-    private native void writeOperationModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readControlModeAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-
-    private native void writeControlModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readAlarmMaskAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readFeatureMapAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-=======
     private native void readMaxSpeedAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void readMaxFlowAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+    private native void readMinConstPressureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxConstPressureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinCompPressureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxCompPressureAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinConstSpeedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxConstSpeedAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinConstFlowAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxConstFlowAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMinConstTempAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readMaxConstTempAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readPumpStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void subscribePumpStatusAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
+
+    private native void reportPumpStatusAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
     private native void readEffectiveOperationModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -5782,15 +5434,31 @@ private native void subscribeCapacityAttribute(
     private native void reportCapacityAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
+    private native void readSpeedAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readLifetimeEnergyConsumedAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
     private native void readOperationModeAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void writeOperationModeAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
+    private native void readControlModeAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void writeControlModeAttribute(
+        long chipClusterPtr, DefaultClusterCallback callback, int value);
+
+    private native void readAlarmMaskAttribute(
+        long chipClusterPtr, IntegerAttributeCallback callback);
+
+    private native void readFeatureMapAttribute(
+        long chipClusterPtr, LongAttributeCallback callback);
+
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> e993d01f0 (callback generation done)
   }
 
   public static class RelativeHumidityMeasurementCluster extends BaseChipCluster {
@@ -6222,32 +5890,17 @@ void onSuccess(
 
     public static class TvChannelListAttribute {
       public int majorNumber;
-<<<<<<< HEAD
-            public int minorNumber;
-            public String name;
+      public int minorNumber;
+      public String name;
       public String callSign;
       public String affiliateCallSign;
 
-      public TvChannelListAttribute(
-        int majorNumber,
-                int minorNumber,
-                String name,
-        String callSign,
-        String affiliateCallSign
-      ) {
-=======
-      public int minorNumber;
-      public byte[] name;
-      public byte[] callSign;
-      public byte[] affiliateCallSign;
-
       public TvChannelListAttribute(
           int majorNumber,
           int minorNumber,
-          byte[] name,
-          byte[] callSign,
-          byte[] affiliateCallSign) {
->>>>>>> e993d01f0 (callback generation done)
+          String name,
+          String callSign,
+          String affiliateCallSign) {
         this.majorNumber = majorNumber;
         this.minorNumber = minorNumber;
         this.name = name;
@@ -6318,18 +5971,9 @@ public interface NavigateTargetResponseCallback {
 
     public static class TargetNavigatorListAttribute {
       public int identifier;
-<<<<<<< HEAD
-            public String name;
-
-      public TargetNavigatorListAttribute(
-        int identifier,
-                String name
-      ) {
-=======
-      public byte[] name;
+      public String name;
 
-      public TargetNavigatorListAttribute(int identifier, byte[] name) {
->>>>>>> e993d01f0 (callback generation done)
+      public TargetNavigatorListAttribute(int identifier, String name) {
         this.identifier = identifier;
         this.name = name;
       }
@@ -6491,6 +6135,7 @@ public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
@@ -6518,30 +6163,22 @@ >>>>>>> e993d01f0 (callback generation done)
 =======
 >>>>>>> f00108887 (merge conflict)
 >>>>>>> c49afcc9f (merge conflict)
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
 
-
-    public void testListInt8UReverseRequest(TestListInt8UReverseResponseCallback callback, int arg1) {
+    public void testListInt8UReverseRequest(
+        TestListInt8UReverseResponseCallback callback, int arg1) {
       testListInt8UReverseRequest(chipClusterPtr, callback, arg1);
     }
 
-
-    public void testListStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
+    public void testListStructArgumentRequest(
+        DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
       testListStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
 
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-=======
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
     public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
@@ -6561,33 +6198,11 @@ public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-    public void testStructArgumentRequest(DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> f00108887 (merge conflict)
     public void testStructArgumentRequest(
         DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f) {
->>>>>>> e993d01f0 (callback generation done)
       testStructArgumentRequest(chipClusterPtr, callback, a, b, c, d, e, f);
     }
 
-<<<<<<< HEAD
-
-<<<<<<< HEAD
-=======
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
     public void testUnknownCommand(DefaultClusterCallback callback) {
       testUnknownCommand(chipClusterPtr, callback);
     }
@@ -6598,6 +6213,7 @@ public void testUnknownCommand(DefaultClusterCallback callback) {
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
@@ -6649,6 +6265,8 @@ >>>>>>> c49afcc9f (merge conflict)
 >>>>>>> 6e6e45a1a (callback generation done)
 =======
 >>>>>>> f00108887 (merge conflict)
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
 
     private native void testAddArguments(
         long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
@@ -6669,18 +6287,6 @@ private native void testListStructArgumentRequest(
         String e,
         int f);
 
-<<<<<<< HEAD
-=======
-    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
-    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
     private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -6694,18 +6300,6 @@ >>>>>>> e83b94d19 (need to wait for cast-helper)
 
 >>>>>>> 677ef48a5 (callback generation done)
     private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
-<<<<<<< HEAD
-    private native void testStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-    private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
-
-    private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
->>>>>>> f00108887 (merge conflict)
 
     private native void testStructArgumentRequest(
         long chipClusterPtr,
@@ -6717,20 +6311,6 @@ private native void testStructArgumentRequest(
         String e,
         int f);
 
-<<<<<<< HEAD
-=======
->>>>>>> 57aece691 (basic code generation template, but not able to import to tool app)
-=======
-
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
->>>>>>> d51f00a65 (need to wait for cast-helper)
-=======
-
->>>>>>> 6e6e45a1a (callback generation done)
->>>>>>> e993d01f0 (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
     private native void testUnknownCommand(long chipClusterPtr, DefaultClusterCallback callback);
 
     public interface TestAddArgumentsResponseCallback {
@@ -6747,10 +6327,10 @@ public interface TestEnumsResponseCallback {
 
     public interface TestListInt8UReverseResponseCallback {
       void onSuccess(
-      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t * 
-      // Conversion from this type to Java is not properly implemented yet
-      );
-      
+          // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
+          // Conversion from this type to Java is not properly implemented yet
+          );
+
       void onError(Exception error);
     }
 
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index b5c43386ab7899..a6ef53e41164a0 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -184,6 +184,7 @@ public void onError(Exception error) {
     }
   }
 
+<<<<<<< HEAD
   public class DelegatedClearAllPinsResponseCallback
       implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback,
           DelegatedClusterCallback {
@@ -7646,6 +7647,8 @@ public void onError(Exception error) {
     }
   }
 
+=======
+>>>>>>> 698449e64 (add recycler view to display endpoint)
   public class DelegatedClearAllPinsResponseCallback
       implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback,
           DelegatedClusterCallback {
@@ -9006,7 +9009,7 @@ public void setCallbackDelegate(ClusterCommandCallback callback) {
     }
 
     @Override
-    public void onSuccess(int StatusCode, int FabricIndex, byte[] DebugText) {
+    public void onSuccess(int StatusCode, int FabricIndex, String DebugText) {
       List<Object> responseValues = new ArrayList<>();
       responseValues.add(StatusCode);
       responseValues.add(FabricIndex);
@@ -10335,6 +10338,395 @@ >>>>>>> fde1d13c0 (fix comments)
             (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId),
             bindingClusterCommandInfoMap);
     clusterMap.put("binding", bindingClusterInfo);
+    Map<String, CommandInfo> booleanStateClusterCommandInfoMap = new LinkedHashMap<>();
+    // Populate cluster
+    ClusterInfo booleanStateClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId),
+            booleanStateClusterCommandInfoMap);
+    clusterMap.put("booleanState", booleanStateClusterInfo);
+    Map<String, CommandInfo> bridgedActionsClusterCommandInfoMap = new LinkedHashMap<>();
+    Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsdisableActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsdisableActionCommandParams.put(
+        "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsdisableActionCommandParams.put(
+        "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsdisableActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .disableAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsdisableActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "disableAction", bridgedActionsdisableActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsdisableActionWithDurationCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", long.class);
+    bridgedActionsdisableActionWithDurationCommandParams.put(
+        "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsdisableActionWithDurationCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .disableActionWithDuration(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsdisableActionWithDurationCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "disableActionWithDuration", bridgedActionsdisableActionWithDurationCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsenableActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsenableActionCommandParams.put(
+        "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsenableActionCommandParams.put(
+        "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsenableActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .enableAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsenableActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put("enableAction", bridgedActionsenableActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsenableActionWithDurationCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", long.class);
+    bridgedActionsenableActionWithDurationCommandParams.put(
+        "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsenableActionWithDurationCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .enableActionWithDuration(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsenableActionWithDurationCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "enableActionWithDuration", bridgedActionsenableActionWithDurationCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsinstantActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsinstantActionCommandParams.put(
+        "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsinstantActionCommandParams.put(
+        "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsinstantActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .instantAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsinstantActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "instantAction", bridgedActionsinstantActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsinstantActionWithTransitionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
+        "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
+        "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
+
+    CommandParameterInfo
+        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
+            new CommandParameterInfo("transitionTime", int.class);
+    bridgedActionsinstantActionWithTransitionCommandParams.put(
+        "transitionTime",
+        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsinstantActionWithTransitionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .instantActionWithTransition(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"),
+                      (Integer) commandArguments.get("transitionTime"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsinstantActionWithTransitionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "instantActionWithTransition", bridgedActionsinstantActionWithTransitionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionspauseActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionspauseActionCommandParams.put(
+        "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionspauseActionCommandParams.put(
+        "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionspauseActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .pauseAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionspauseActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put("pauseAction", bridgedActionspauseActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionspauseActionWithDurationCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", long.class);
+    bridgedActionspauseActionWithDurationCommandParams.put(
+        "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionspauseActionWithDurationCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .pauseActionWithDuration(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionspauseActionWithDurationCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "pauseActionWithDuration", bridgedActionspauseActionWithDurationCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsresumeActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsresumeActionCommandParams.put(
+        "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsresumeActionCommandParams.put(
+        "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsresumeActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .resumeAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsresumeActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put("resumeAction", bridgedActionsresumeActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsstartActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsstartActionCommandParams.put(
+        "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsstartActionCommandParams.put(
+        "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsstartActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .startAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsstartActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put("startAction", bridgedActionsstartActionCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsstartActionWithDurationCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
+        new CommandParameterInfo("duration", long.class);
+    bridgedActionsstartActionWithDurationCommandParams.put(
+        "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsstartActionWithDurationCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .startActionWithDuration(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"),
+                      (Long) commandArguments.get("duration"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsstartActionWithDurationCommandParams);
+    bridgedActionsClusterCommandInfoMap.put(
+        "startActionWithDuration", bridgedActionsstartActionWithDurationCommandInfo);
+    Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
+        new LinkedHashMap<String, CommandParameterInfo>();
+    // TODO: fill out parameter types
+    CommandParameterInfo bridgedActionsstopActionCommandParameterInfo =
+        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
+    CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
+        new CommandParameterInfo("actionID", int.class);
+    bridgedActionsstopActionCommandParams.put(
+        "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
+
+    CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
+        new CommandParameterInfo("invokeID", long.class);
+    bridgedActionsstopActionCommandParams.put(
+        "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
+
+    // Populate commands
+    CommandInfo bridgedActionsstopActionCommandInfo =
+        new CommandInfo(
+            (cluster, callback, commandArguments) -> {
+              ((ChipClusters.BridgedActionsCluster) cluster)
+                  .stopAction(
+                      (DefaultClusterCallback) callback,
+                      (Integer) commandArguments.get("actionID"),
+                      (Long) commandArguments.get("invokeID"));
+            },
+            () -> new DelegatedDefaultClusterCallback(),
+            bridgedActionsstopActionCommandParams);
+    bridgedActionsClusterCommandInfoMap.put("stopAction", bridgedActionsstopActionCommandInfo);
+    // Populate cluster
+    ClusterInfo bridgedActionsClusterInfo =
+        new ClusterInfo(
+            (ptr, endpointId) -> new ChipClusters.BridgedActionsCluster(ptr, endpointId),
+            bridgedActionsClusterCommandInfoMap);
+    clusterMap.put("bridgedActions", bridgedActionsClusterInfo);
     Map<String, CommandInfo> bridgedDeviceBasicClusterCommandInfoMap = new LinkedHashMap<>();
     // Populate cluster
     ClusterInfo bridgedDeviceBasicClusterInfo =
@@ -12456,7 +12848,9 @@ >>>>>>> fde1d13c0 (fix comments)
 >>>>>>> fde1d13c0 (fix comments)
     // TODO: fill out parameter types
     CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
-        new CommandParameterInfo("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
+        new CommandParameterInfo(
+            "DiagnosticLogs",
+            ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback.class);
     CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
         new CommandParameterInfo("intent", int.class);
     diagnosticLogsretrieveLogsRequestCommandParams.put(
@@ -12493,13 +12887,13 @@ >>>>>>> fde1d13c0 (fix comments)
 =======
               ((ChipClusters.DiagnosticLogsCluster) cluster)
                   .retrieveLogsRequest(
-                      (DefaultClusterCallback) callback,
+                      (ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback,
                       (Integer) commandArguments.get("intent"),
                       (Integer) commandArguments.get("requestedProtocol"),
                       (byte[]) commandArguments.get("transferFileDesignator"));
 >>>>>>> 677ef48a5 (callback generation done)
             },
-            () -> new DelegatedDefaultClusterCallback(),
+            () -> new DelegatedRetrieveLogsResponseCallback(),
             diagnosticLogsretrieveLogsRequestCommandParams);
     diagnosticLogsClusterCommandInfoMap.put(
         "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestCommandInfo);

From 9a14b21f9423374b9a54b7697ae95a061dccf004 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 25 Oct 2021 22:03:22 -0400
Subject: [PATCH 30/38] recycler view for endpoint display and test cluster
 detail screen done

---
 .../ClusterDetailFragment.kt                  | 72 +++++++++++++++++++
 .../ClusterInteractionFragment.kt             | 30 +++++++-
 .../clusterinteraction/EndpointAdapter.kt     | 23 +++++-
 .../res/layout/cluster_detail_fragment.xml    | 17 +++++
 .../layout/cluster_interaction_fragment.xml   |  1 +
 .../app/src/main/res/layout/endpoint_item.xml |  6 +-
 6 files changed, 142 insertions(+), 7 deletions(-)
 create mode 100644 src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
 create mode 100644 src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
new file mode 100644
index 00000000000000..8a661f8990a048
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -0,0 +1,72 @@
+package com.google.chip.chiptool.clusterclient.clusterinteraction
+
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import androidx.fragment.app.Fragment
+import chip.clusterinfo.ClusterCommandCallback
+import chip.clusterinfo.ClusterInfo
+import chip.clusterinfo.CommandInfo
+import chip.devicecontroller.ChipDeviceController
+import com.google.chip.chiptool.ChipClient
+import com.google.chip.chiptool.GenericChipDeviceListener
+import com.google.chip.chiptool.R
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancel
+
+class ClusterDetailFragment : Fragment(){
+  private val deviceController: ChipDeviceController
+    get() = ChipClient.getDeviceController(requireContext())
+
+  private val scope = CoroutineScope(Dispatchers.Main + Job())
+
+  override fun onCreateView(
+    inflater: LayoutInflater,
+    container: ViewGroup?,
+    savedInstanceState: Bundle?
+  ): View {
+    return inflater.inflate(R.layout.cluster_detail_fragment, container, false).apply {
+      deviceController.setCompletionListener(ChipControllerCallback())
+    }
+  }
+
+  private fun showMessage(msg: String) {
+    requireActivity().runOnUiThread {
+      Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
+    }
+  }
+
+  inner class ChipControllerCallback : GenericChipDeviceListener() {
+    override fun onConnectDeviceComplete() {}
+
+    override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
+    }
+
+    override fun onNotifyChipConnectionClosed() {
+      Log.d(TAG, "onNotifyChipConnectionClosed")
+    }
+
+    override fun onCloseBleComplete() {
+      Log.d(TAG, "onCloseBleComplete")
+    }
+
+    override fun onError(error: Throwable?) {
+      Log.d(TAG, "onError: $error")
+    }
+  }
+
+  override fun onStop() {
+    super.onStop()
+    scope.cancel()
+  }
+
+  companion object {
+    private const val TAG = "ClusterDetailFragment"
+    fun newInstance(): ClusterDetailFragment = ClusterDetailFragment()
+  }
+}
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index bc2e540e5f8bcd..4545699dbc7ed3 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -5,7 +5,6 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.LinearLayout
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -24,11 +23,13 @@ import kotlinx.coroutines.cancel
 <<<<<<< HEAD
 import chip.devicecontroller.ClusterInfoMapping
 import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
+import com.google.chip.chiptool.setuppayloadscanner.BarcodeFragment
 import java.lang.Exception
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.endpointList
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
 import kotlinx.coroutines.launch
 
+<<<<<<< HEAD
 =======
 import
 >>>>>>> 505e97db3 (change package)
@@ -40,6 +41,9 @@ import kotlinx.coroutines.launch
 >>>>>>> a4fd0282e (no error code generation)
 
 class ClusterInteractionFragment : Fragment() {
+=======
+class ClusterInteractionFragment : Fragment(){
+>>>>>>> f5940e9dd (recycler view for endpoint display and test cluster detail screen done)
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
 
@@ -69,11 +73,13 @@ class ClusterInteractionFragment : Fragment() {
       clusterMap = ClusterInfoMapping().clusterMap;
       getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
       var dataList: List<EndpointItem> = ArrayList<EndpointItem>()
-      for (i in 0 until 40) {
+      // TODO: Dynamically retrieve endpoint information using descriptor cluster
+      // hardcode the endpoint for now
+      for (i in 0 until 7) {
         dataList += EndpointItem(i)
       }
 
-      endpointList.adapter = EndpointAdapter(dataList)
+      endpointList.adapter = EndpointAdapter(dataList, endpointListener())
       endpointList.layoutManager = LinearLayoutManager(requireContext())
     }
   }
@@ -201,4 +207,22 @@ class ClusterInteractionFragment : Fragment() {
     private const val TAG = "ClusterInteractionFragment"
     fun newInstance(): ClusterInteractionFragment = ClusterInteractionFragment()
   }
+
+  private fun showFragment(fragment: Fragment, showOnBack: Boolean = true) {
+    val fragmentTransaction = requireActivity().supportFragmentManager
+      .beginTransaction()
+      .replace(R.id.fragment_container, fragment, fragment.javaClass.simpleName)
+
+    if (showOnBack) {
+      fragmentTransaction.addToBackStack(null)
+    }
+
+    fragmentTransaction.commit()
+  }
+  inner class endpointListener: EndpointAdapter.OnItemClickListener {
+    override fun onItemClick(position: Int) {
+      Toast.makeText(requireContext(), "Item $position clicked", Toast.LENGTH_SHORT).show()
+      showFragment(ClusterDetailFragment.newInstance(), true)
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
index ff33dab694ecea..5912574d156a52 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -3,17 +3,36 @@ package com.google.chip.chiptool.clusterclient.clusterinteraction
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.chip.chiptool.R
 
-class EndpointAdapter(private val endpointList: List<EndpointItem>) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
+class EndpointAdapter(private val endpointList: List<EndpointItem>,
+                      private val listener: OnItemClickListener
 
-  class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
+
+  inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
     val endpointId: TextView = itemView.findViewById(R.id.endpoint_id)
+    init {
+      itemView.setOnClickListener(this)
+    }
+
+    override fun onClick(p0: View?) {
+      val position = adapterPosition
+      if (position != RecyclerView.NO_POSITION) {
+        listener.onItemClick(position)
+      }
+    }
 
   }
 
+  interface OnItemClickListener {
+    fun onItemClick(position: Int)
+  }
+
+
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EndpointViewHolder {
     val itemView = LayoutInflater.from(parent.context).inflate(R.layout.endpoint_item, parent, false)
     return EndpointViewHolder(itemView)
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
new file mode 100644
index 00000000000000..bc388ee545091b
--- /dev/null
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/textView"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginTop="286dp"
+      android:layout_marginStart="147dp"
+      android:text="Testing"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
index 4930780d80eb3f..6ce6beac21cc5e 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
@@ -27,6 +27,7 @@
       android:id="@+id/endpointList"
       android:layout_width="409dp"
       android:layout_height="549dp"
+      android:clipToPadding="false"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@+id/getClusterMappingBtn" />
 
diff --git a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
index 7174cf46cde93e..fc853c4369916a 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
@@ -7,7 +7,7 @@
 
   <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="match_parent"
       android:padding="8dp"
       android:layout_margin="4dp">
 
@@ -16,11 +16,13 @@
         android:textStyle="bold"
         android:width="100dp"
         android:height="70dp"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:text="endpoint 1"
         android:textColor="@android:color/black"
         android:textSize="18sp"
+        android:background="@color/cardview_shadow_start_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 

From 2a93632fd5c337aa51e5d4c88fcffcffa050123a Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Mon, 25 Oct 2021 22:09:41 -0400
Subject: [PATCH 31/38] change number of hard-coded enpoint to 2

---
 .../clusterinteraction/ClusterInteractionFragment.kt            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 4545699dbc7ed3..0f1c5b58a0cec6 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -75,7 +75,7 @@ class ClusterInteractionFragment : Fragment(){
       var dataList: List<EndpointItem> = ArrayList<EndpointItem>()
       // TODO: Dynamically retrieve endpoint information using descriptor cluster
       // hardcode the endpoint for now
-      for (i in 0 until 7) {
+      for (i in 0 until 2) {
         dataList += EndpointItem(i)
       }
 

From 2f839b71719b90f4739c272e00163f6ad246212b Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Wed, 27 Oct 2021 21:04:56 -0400
Subject: [PATCH 32/38] endpoint first draft done

---
 .../ClusterInteractionFragment.kt             | 149 +++---------------
 .../layout/cluster_interaction_fragment.xml   |  10 +-
 .../app/src/main/res/layout/endpoint_item.xml |   2 +-
 .../app/src/main/res/values/strings.xml       |   4 +-
 4 files changed, 32 insertions(+), 133 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 0f1c5b58a0cec6..7564538dbafe05 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -8,9 +8,7 @@ import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import chip.clusterinfo.ClusterCommandCallback
 import chip.clusterinfo.ClusterInfo
-import chip.clusterinfo.CommandInfo
 import chip.devicecontroller.ChipDeviceController
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
@@ -19,44 +17,22 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
-<<<<<<< HEAD
-<<<<<<< HEAD
 import chip.devicecontroller.ClusterInfoMapping
 import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
-import com.google.chip.chiptool.setuppayloadscanner.BarcodeFragment
-import java.lang.Exception
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.endpointList
-import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getEndpoingListBtn
 import kotlinx.coroutines.launch
 
-<<<<<<< HEAD
-=======
-import
->>>>>>> 505e97db3 (change package)
-=======
-import chip.devicecontroller.ClusterInfoMapping
-import java.lang.Exception
-import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getClusterMappingBtn
-import kotlinx.coroutines.launch
->>>>>>> a4fd0282e (no error code generation)
-
 class ClusterInteractionFragment : Fragment() {
-=======
-class ClusterInteractionFragment : Fragment(){
->>>>>>> f5940e9dd (recycler view for endpoint display and test cluster detail screen done)
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
 
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
-<<<<<<< HEAD
-<<<<<<< HEAD
-  private lateinit var clusterMap: Map<String, ClusterInfo>
-=======
->>>>>>> a4fd0282e (no error code generation)
-=======
-  private lateinit var clusterMap: Map<String, ClusterInfo>
->>>>>>> 41b0956c1 (on/off commands working)
+  private lateinit var clusterMap: HashMap<String, ClusterInfo>
+  private var devicePtr = 0L
+  private val endpointId = 1
+
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -65,117 +41,39 @@ class ClusterInteractionFragment : Fragment(){
   ): View {
     return inflater.inflate(R.layout.cluster_interaction_fragment, container, false).apply {
       deviceController.setCompletionListener(ChipControllerCallback())
+      if (devicePtr == 0L) {
+        endpointList.visibility = View.GONE
+      }
+      getEndpoingListBtn.setOnClickListener {
+        scope.launch {
+          setDevicePtr()
+          showMessage("Button Clicked")
+          endpointList.visibility = View.VISIBLE
+        }
+      }
+
       addressUpdateFragment =
         childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-      clusterMap = ClusterInfoMapping().clusterMap;
-      getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
-      var dataList: List<EndpointItem> = ArrayList<EndpointItem>()
+      clusterMap = ClusterInfoMapping().clusterMap as HashMap<String, ClusterInfo>;
+      var dataList: List<EndpointItem> = ArrayList()
       // TODO: Dynamically retrieve endpoint information using descriptor cluster
       // hardcode the endpoint for now
-      for (i in 0 until 2) {
+      for (i in 0 until 19) {
         dataList += EndpointItem(i)
       }
-
-      endpointList.adapter = EndpointAdapter(dataList, endpointListener())
+      endpointList.adapter = EndpointAdapter(dataList, EndpointListener())
       endpointList.layoutManager = LinearLayoutManager(requireContext())
     }
   }
 
-  private suspend fun getClusterMapping() {
-    // In real code: "OnOff" would be selected by the user.
-    val methodSelected = "onOff"
-    showMessage(methodSelected + " is initialized")
-    val selectedClusterInfo = clusterMap[methodSelected]!!
-    val devicePtr =
+  private suspend fun setDevicePtr() {
+    devicePtr =
       ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
-    val endpointId = 1
-    val selectedCluster = selectedClusterInfo.createClusterFunction.create(devicePtr, endpointId)
-    // Imagine user wants to execute the command "OffWithEffect", pass the string here
-    val selectedCommandInfo: CommandInfo = selectedClusterInfo.commands["on"]!!
-
-    var selectedCommandCallback =  selectedCommandInfo.commandCallbackSupplier.get()
-    selectedCommandCallback?.setCallbackDelegate(object : ClusterCommandCallback {
-      override fun onSuccess(responseValues: List<Any>) {
-        showMessage("Command success")
-        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
-        responseValues.forEach { Log.d(TAG, it.toString()) }
-      }
-
-      override fun onFailure(exception: Exception) {
-<<<<<<< HEAD
-        showMessage("Command failed")
-        Log.e(TAG, exception.toString())
-      }
-    })
-
-    var commandArguments: HashMap<String, Any> = HashMap<String, Any>()
-    selectedCommandInfo.getCommandFunction().invokeCommand(selectedCluster, selectedCommandCallback, commandArguments)
   }
 
   private fun showMessage(msg: String) {
     requireActivity().runOnUiThread {
       Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
-=======
-      getClusterMappingBtn.setOnClickListener { getClusterMapping()}
-    }
-  }
-
-  private fun getClusterMapping() {
-    val clusterInfoMapping = ClusterInfoMapping();
-    val test = clusterInfoMapping.clusterMap;
-    for ((key, value) in test.entries) {
-      println("${key}=$value")
->>>>>>> a4fd0282e (no error code generation)
-=======
-      val clusterMapping = ClusterInfoMapping()
-      clusterMap = clusterMapping.clusterMap;
-      getClusterMappingBtn.setOnClickListener { scope.launch {getClusterMapping()} }
-=======
-      clusterMap = ClusterInfoMapping().clusterMap;
-      getClusterMappingBtn.setOnClickListener { scope.launch { getClusterMapping() } }
->>>>>>> fde1d13c0 (fix comments)
-    }
-  }
-
-  private suspend fun getClusterMapping() {
-    // In real code: "OnOff" would be selected by the user.
-    val methodSelected = "onOff"
-    showMessage(methodSelected + " is initialized")
-    val selectedClusterInfo = clusterMap[methodSelected]!!
-    val devicePtr =
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
-    val endpointId = 1
-    val selectedCluster = selectedClusterInfo.createClusterFunction.create(devicePtr, endpointId)
-    // Imagine user wants to execute the command "OffWithEffect", pass the string here
-    val selectedCommandInfo: CommandInfo = selectedClusterInfo.commands["on"]!!
-
-    var selectedCommandCallback =  selectedCommandInfo.commandCallbackSupplier.get()
-    selectedCommandCallback?.setCallbackDelegate(object : ClusterCommandCallback {
-      override fun onSuccess(responseValues: List<Any>) {
-        showMessage("Command success")
-        // Populate UI based on response values. We know the types from CommandInfo.getCommandResponses().
-        responseValues.forEach { Log.d(TAG, it.toString()) }
-      }
-
-      override fun onFailure(exception: Exception?) {
-=======
->>>>>>> ef97f0702 (resolve type, nullable and format comments)
-        showMessage("Command failed")
-        Log.e(TAG, exception.toString())
-      }
-    })
-
-    var commandArguments: HashMap<String, Any> = HashMap<String, Any>()
-    selectedCommandInfo.getCommandFunction().invokeCommand(selectedCluster, selectedCommandCallback, commandArguments)
-  }
-
-  private fun showMessage(msg: String) {
-    requireActivity().runOnUiThread {
-      Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
->>>>>>> 41b0956c1 (on/off commands working)
     }
   }
 
@@ -219,7 +117,8 @@ class ClusterInteractionFragment : Fragment(){
 
     fragmentTransaction.commit()
   }
-  inner class endpointListener: EndpointAdapter.OnItemClickListener {
+
+  inner class EndpointListener : EndpointAdapter.OnItemClickListener {
     override fun onItemClick(position: Int) {
       Toast.makeText(requireContext(), "Item $position clicked", Toast.LENGTH_SHORT).show()
       showFragment(ClusterDetailFragment.newInstance(), true)
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
index 6ce6beac21cc5e..4acd02d876f7c9 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
@@ -7,12 +7,12 @@
     android:layout_height="match_parent">
 
   <Button
-      android:id="@+id/getClusterMappingBtn"
+      android:id="@+id/getEndpoingListBtn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="132dp"
       android:layout_marginStart="16dp"
-      android:text="Button"
+      android:text="@string/retrieve_endpoint_list"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   <androidx.fragment.app.FragmentContainerView
@@ -25,10 +25,10 @@
       app:layout_constraintTop_toTopOf="parent" />
   <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/endpointList"
-      android:layout_width="409dp"
-      android:layout_height="549dp"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
       android:clipToPadding="false"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/getClusterMappingBtn" />
+      app:layout_constraintTop_toBottomOf="@+id/getEndpoingListBtn" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
index fc853c4369916a..bec6ea92d93c16 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
@@ -18,7 +18,7 @@
         android:height="70dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:layout_marginStart="8dp"
         android:text="endpoint 1"
         android:textColor="@android:color/black"
         android:textSize="18sp"
diff --git a/src/android/CHIPTool/app/src/main/res/values/strings.xml b/src/android/CHIPTool/app/src/main/res/values/strings.xml
index 992f6586ab051c..40999a55185c80 100644
--- a/src/android/CHIPTool/app/src/main/res/values/strings.xml
+++ b/src/android/CHIPTool/app/src/main/res/values/strings.xml
@@ -98,7 +98,7 @@
     <string name="op_cred_client_btn_text">Operational Credentials cluster</string>
     <string name="op_cred_client_read_supported_fabric_btn_text">Read Supported Fabric count</string>
     <string name="op_cred_client_read_commissioned_fabric_btn_text">Read Commissioned Fabric count</string>
-    
+
     <string name="basic_cluster_btn_text">Basic cluster</string>
     <string name="basic_cluster_read_user_label_btn_text">Read User Label</string>
     <string name="basic_cluster_write_user_label_btn_text">Write User Label</string>
@@ -123,5 +123,5 @@
     <string name="dcl_response_key">result</string>
     <string name="dcl_custom_flow_url_key">custom</string>
     <string name="custom_flow_return_url"></string>
-
+    <string name="retrieve_endpoint_list">Retrieve Endpoint List</string>
 </resources>

From 898409a919a29538cbb669b132bd317555d5cf40 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 28 Oct 2021 10:37:16 -0400
Subject: [PATCH 33/38] resolve conflict

---
 .../.idea/deploymentTargetDropDown.xml        |    17 -
 src/controller/java/BUILD.gn                  |    42 +-
 .../clusterinfo/ClusterCommandCallback.java   |    32 +-
 .../src/chip/clusterinfo/ClusterInfo.java     |    89 +-
 .../src/chip/clusterinfo/CommandInfo.java     |   131 +-
 .../clusterinfo/CommandParameterInfo.java     |    37 +-
 .../clusterinfo/DelegatedClusterCallback.java |    31 +-
 .../java/templates/ClusterInfo-java.zapt      |   161 +-
 src/controller/java/templates/templates.json  |    14 +-
 .../java/zap-generated/CHIPClusters-JNI.cpp   |   279 -
 .../chip/devicecontroller/ChipClusters.java   |   384 +-
 .../devicecontroller/ClusterInfoMapping.java  | 17793 +---------------
 12 files changed, 182 insertions(+), 18828 deletions(-)
 delete mode 100644 src/android/CHIPTool/.idea/deploymentTargetDropDown.xml

diff --git a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml b/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
deleted file mode 100644
index 5f90c3435a4aee..00000000000000
--- a/src/android/CHIPTool/.idea/deploymentTargetDropDown.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetDropDown">
-    <runningDeviceTargetSelectedWithDropDown>
-      <Target>
-        <type value="RUNNING_DEVICE_TARGET" />
-        <deviceKey>
-          <Key>
-            <type value="SERIAL_NUMBER" />
-            <value value="12171FDD4002GB" />
-          </Key>
-        </deviceKey>
-      </Target>
-    </runningDeviceTargetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2021-10-25T17:50:07.909204Z" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index aea8397a339720..d0580b8c1d98f0 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -58,28 +58,11 @@ android_library("java") {
   ]
 
   sources = [
-<<<<<<< HEAD
-<<<<<<< HEAD
     "src/chip/clusterinfo/ClusterCommandCallback.java",
     "src/chip/clusterinfo/ClusterInfo.java",
     "src/chip/clusterinfo/CommandInfo.java",
-<<<<<<< HEAD
     "src/chip/clusterinfo/CommandParameterInfo.java",
     "src/chip/clusterinfo/DelegatedClusterCallback.java",
-=======
-    "src/chip/clusterinfo/CommandParameter.java",
-    "src/chip/clusterinfo/DelegatedClusterCallback.java",
-    "src/chip/clusterinfo/ParameterType.java",
->>>>>>> 9199ce0a6 (Restyled by gn)
-=======
->>>>>>> fde1d13c0 (fix comments)
-=======
-    "src/chip/clusterinfo/ClusterCommandCallback.java",
-    "src/chip/clusterinfo/ClusterInfo.java",
-    "src/chip/clusterinfo/CommandInfo.java",
-    "src/chip/clusterinfo/CommandParameterInfo.java",
-    "src/chip/clusterinfo/DelegatedClusterCallback.java",
->>>>>>> 0411123b5 (Restyled by gn)
     "src/chip/devicecontroller/ChipClusterException.java",
     "src/chip/devicecontroller/ChipCommandType.java",
     "src/chip/devicecontroller/ChipDeviceController.java",
@@ -87,30 +70,7 @@ android_library("java") {
     "src/chip/devicecontroller/GetConnectedDeviceCallbackJni.java",
     "src/chip/devicecontroller/PaseVerifierParams.java",
     "zap-generated/chip/devicecontroller/ChipClusters.java",
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
-=======
-    "zap-generated/chip/devicecontroller/ClusterInfo.java",
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
     "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
->>>>>>> a4fd0282e (no error code generation)
-=======
->>>>>>> fde1d13c0 (fix comments)
-=======
-    "zap-generated/chip/devicecontroller/ClusterInfoMapping.java",
-<<<<<<< HEAD
-    "src/chip/clusterinfo/ClusterInfo.java",
-    "src/chip/clusterinfo/ClusterCommandCallback.java",
-    "src/chip/clusterinfo/CommandInfo.java",
-    "src/chip/clusterinfo/CommandParameterInfo.java",
-    "src/chip/clusterinfo/DelegatedClusterCallback.java",
->>>>>>> 75ba092b5 (resolve build issues)
-=======
->>>>>>> 0411123b5 (Restyled by gn)
   ]
 
   javac_flags = [ "-Xlint:deprecation" ]
@@ -121,4 +81,4 @@ android_library("java") {
 
 java_prebuilt("android") {
   jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
-}
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index b39bc180f327ee..442340592f3925 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -1,42 +1,12 @@
 package chip.clusterinfo;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 import java.util.List;
-<<<<<<< HEAD
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 /**
  * Interface for making customized callback that implements both onSuccess and onFailure functions.
  */
-=======
-=======
-
->>>>>>> 46c963914 (Restyled by google-java-format)
-import java.util.*;
-=======
->>>>>>> ef97f0702 (resolve type, nullable and format comments)
-
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
-/** Interface for making customized callback that implements both onSuccess and onFailure function */
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
-/**
- * Interface for making customized callback that implements both onSuccess and onFailure functions.
- */
->>>>>>> e3803522e (Restyled by google-java-format)
 public interface ClusterCommandCallback {
   void onSuccess(List<Object> responseValues);
 
   void onFailure(Exception exception);
-<<<<<<< HEAD
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
-}
->>>>>>> df6a682b0 (Restyled by whitespace)
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index cc31923e0b385d..817f355fe0a7f0 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -1,35 +1,9 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 package chip.clusterinfo;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
-=======
-import chip.devicecontroller.ChipClusters.BaseChipCluster;
-<<<<<<< HEAD
-import java.util.*;
->>>>>>> 46c963914 (Restyled by google-java-format)
-=======
-import java.util.Map;
->>>>>>> ef97f0702 (resolve type, nullable and format comments)
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 /** ClusterInfo maps commands and provides a constructor function for a cluster. */
-=======
-/**
-  ClusterInfo maps commands and provides a constructor function for a cluster
- */
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
-/** ClusterInfo maps commands and provides a constructor function for a cluster */
->>>>>>> 68e157c68 (Restyled by google-java-format)
-=======
-/** ClusterInfo maps commands and provides a constructor function for a cluster. */
->>>>>>> 74fe2b5bd (add . at the end of class description)
 public class ClusterInfo {
   private final ClusterConstructor createClusterFunction;
   private final Map<String, CommandInfo> commands;
@@ -48,73 +22,12 @@ public Map<String, CommandInfo> getCommands() {
   }
 
   /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-   * The functional interface provides a uniform way to create cluster through create function. In
-   * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
-   * lambda function, it only needs to have ptr and endpointId to create the intended cluster.
-=======
-   * The functional interface provides a uniform way to create cluster through create
-   * function. In ClusterInfoMapping, each ClusterConstructor was generated using the
-   * intended function. Using lambda function, the app component only needs to have ptr
-   * and endpointId to create the intended cluster.
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
    * The functional interface provides a uniform way to create cluster through create function. In
    * ClusterInfoMapping, each ClusterConstructor was generated using the intended function. Using
-<<<<<<< HEAD
-   * lambda function, it only needs to have ptr and endpointId to create the intended
-   * cluster.
->>>>>>> e3803522e (Restyled by google-java-format)
-=======
    * lambda function, it only needs to have ptr and endpointId to create the intended cluster.
->>>>>>> 68e157c68 (Restyled by google-java-format)
    */
   @FunctionalInterface
   public interface ClusterConstructor {
     BaseChipCluster create(Long devicePtr, int endpointId);
   }
-}
-<<<<<<< HEAD
-=======
-package chip.devicecontroller;
-=======
-package chip.clusterinfo;
->>>>>>> 505e97db3 (change package)
-=======
-import java.util.*;
-<<<<<<< HEAD
->>>>>>> a4fd0282e (no error code generation)
-=======
-import chip.devicecontroller.ChipClusters.BaseChipCluster;
->>>>>>> 2d2bbd2e1 (new design solution)
-
-public class ClusterInfo {
-  private final ClusterConstructor createClusterFunction;
-  private final Map<String, CommandInfo> commands;
-
-  public ClusterInfo(ClusterConstructor createClusterFunction, Map<String, CommandInfo> commands) {
-    this.createClusterFunction = createClusterFunction;
-    this.commands = commands;
-  }
-
-<<<<<<< HEAD
-}
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
-  public ClusterConstructor getCreateClusterFunction() {
-    return createClusterFunction;
-  }
-
-  public Map<String, CommandInfo> getCommands() {
-    return commands;
-  }
-
-  @FunctionalInterface
-  public interface ClusterConstructor {
-    BaseChipCluster create(Long devicePtr, int endpointId);
-  }
-}
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
->>>>>>> df6a682b0 (Restyled by whitespace)
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index 0360dab8ed3133..ff0a2f9335787f 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -1,44 +1,15 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 package chip.clusterinfo;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import chip.devicecontroller.ChipClusters.BaseChipCluster;
 import java.util.Map;
 import java.util.function.Supplier;
 
 /**
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
  * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
  * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
  * parameter and commandParametersInfo.
  */
 public class CommandInfo {
-=======
- * CommandInfo includes a functional interface to invoke arbitrary commands based on cluster,
- * callback and a map of arguments, a Supplier that provides DelegatedClusterCallback, and a Map
- * that includes the name of the parameter and commandParametersInfo.
-=======
- * CommandInfo has a functional interface to invoke arbitrary commands based on cluster,
- * callback and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and
- * maps the parameter and commandParametersInfo.
->>>>>>> 4054a1371 (modify description of each new added class)
-=======
- * CommandInfo has a functional interface to invoke arbitrary commands based on cluster, callback
- * and a map of arguments, a Supplier that provides {@link DelegatedClusterCallback}, and maps the
- * parameter and commandParametersInfo.
->>>>>>> 68e157c68 (Restyled by google-java-format)
- */
-<<<<<<< HEAD
-
- public class CommandInfo {
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
-public class CommandInfo {
->>>>>>> e3803522e (Restyled by google-java-format)
   public ClusterCommandFunction commandFunction;
   private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
   private Map<String, CommandParameterInfo> commandParameters;
@@ -64,115 +35,15 @@ public Map<String, CommandParameterInfo> getCommandParameters() {
     return commandParameters;
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-  /**
-   * The functional interface provides a uniform way to invoke commands through invokeCommand
-   * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the intended
-   * function. By using lambda function, the app component only needs to have cluster, callback,
-   * commandArguments to execute the correct function.
-   */
-=======
-
-  /** The functional interface provides a uniform way to invoke commands through invokeCommand
-  * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the
-  * intended function. Using lambda function, the app component only needs to have cluster,
-  * callback, commandArguments to execute the correct function.
-  */
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
   /**
    * The functional interface provides a uniform way to invoke commands through invokeCommand
    * function. In ClusterInfoMapping, each ClusterCommandFunction was generated using the intended
    * function. By using lambda function, the app component only needs to have cluster, callback,
    * commandArguments to execute the correct function.
    */
->>>>>>> e3803522e (Restyled by google-java-format)
-  @FunctionalInterface
-  public interface ClusterCommandFunction {
-    void invokeCommand(
-        BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
-  }
-}
-=======
-package chip.devicecontroller;
-=======
-package chip.clusterinfo;
->>>>>>> 505e97db3 (change package)
-=======
-import java.util.function.Function;
-=======
-import chip.devicecontroller.ChipClusters.BaseChipCluster;
->>>>>>> 46c963914 (Restyled by google-java-format)
-import java.util.*;
-<<<<<<< HEAD
->>>>>>> a4fd0282e (no error code generation)
-
-=======
-import java.util.function.Supplier;
-<<<<<<< HEAD
-import chip.clusterinfo.DelegatedClusterCallback;
-import chip.devicecontroller.ChipClusters.BaseChipCluster;
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
->>>>>>> 46c963914 (Restyled by google-java-format)
-
-public class CommandInfo {
-  public ClusterCommandFunction commandFunction;
-  private Supplier<DelegatedClusterCallback> commandCallbackSupplier;
-  private Map<String, CommandParameterInfo> commandParameters;
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-  public String name;
-  public Function<List<CommandParameter>, Class<?>> fn;
-  public List<CommandParameter> parameters;
-<<<<<<< HEAD
-  public Class callbackClass;
-}
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
-  public Class<?> callbackClass;
-}
->>>>>>> a4fd0282e (no error code generation)
-=======
-
-  public CommandInfo(ClusterCommandFunction commandFunction,
-      Supplier<DelegatedClusterCallback> commandCallbackSupplier, Map<String, CommandParameter> commandParameters) {
-=======
-  public CommandInfo(
-      ClusterCommandFunction commandFunction,
-      Supplier<DelegatedClusterCallback> commandCallbackSupplier,
-<<<<<<< HEAD
-      Map<String, CommandParameter> commandParameters) {
->>>>>>> 46c963914 (Restyled by google-java-format)
-=======
-      Map<String, CommandParameterInfo> commandParameters) {
->>>>>>> fde1d13c0 (fix comments)
-    this.commandFunction = commandFunction;
-    this.commandCallbackSupplier = commandCallbackSupplier;
-    this.commandParameters = commandParameters;
-  }
-
-  public ClusterCommandFunction getCommandFunction() {
-    return commandFunction;
-  }
-
-  public Supplier<DelegatedClusterCallback> getCommandCallbackSupplier() {
-    return commandCallbackSupplier;
-  }
-
-  public Map<String, CommandParameterInfo> getCommandParameters() {
-    return commandParameters;
-  }
-
   @FunctionalInterface
   public interface ClusterCommandFunction {
     void invokeCommand(
         BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
-}
-<<<<<<< HEAD
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
->>>>>>> df6a682b0 (Restyled by whitespace)
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index 7bdb9fe2b3a61a..8e67de57ec913e 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -1,41 +1,6 @@
 package chip.clusterinfo;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 /** CommandParameterInfo captures the name and type of a parameter */
-=======
->>>>>>> fde1d13c0 (fix comments)
-=======
-/** CommandParameterInfo includes a name filed, which represents the name of the paremeter. It  */
-/** also contains a type field to specify what type this commandParameter is, i.e String.class  */
-
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
-/** CommandParameterInfo includes a name filed, which represents the name of the paremeter. It */
-/** also contains a type field to specify what type this commandParameter is, i.e String.class */
->>>>>>> e3803522e (Restyled by google-java-format)
-=======
-/**
- * CommandParameterInfo captures the name and type of a parameter
- */
-
->>>>>>> 4054a1371 (modify description of each new added class)
-=======
-/** CommandParameterInfo captures the name and type of a parameter */
->>>>>>> 68e157c68 (Restyled by google-java-format)
-=======
-/**
- * CommandParameterInfo captures the name and type of a parameter
- */
->>>>>>> 74fe2b5bd (add . at the end of class description)
-=======
-/** CommandParameterInfo captures the name and type of a parameter */
->>>>>>> 85f45fb7a (Restyled by google-java-format)
 public class CommandParameterInfo {
   public CommandParameterInfo() {}
 
@@ -46,4 +11,4 @@ public CommandParameterInfo(String name, Class<?> type) {
 
   public String name;
   public Class<?> type;
-}
+}
\ No newline at end of file
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index bfae8e2149c6de..12eb8f8fb4b334 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -1,35 +1,6 @@
 package chip.clusterinfo;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
-=======
-/** Interface for setting customized ClusterCommandCallback in ClusterInteractionFragment.kt */
->>>>>>> 2185ce827 (add descriptive documentation on each new class)
-=======
-/** Interface for a callback that delegates to {@link ClusterCommandCallback} */
->>>>>>> 4054a1371 (modify description of each new added class)
-=======
-/** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
->>>>>>> 74fe2b5bd (add . at the end of class description)
-public interface DelegatedClusterCallback {
-  void setCallbackDelegate(ClusterCommandCallback callback);
-}
-=======
-import chip.clusterinfo.ClusterCommandCallback;
-=======
->>>>>>> 46c963914 (Restyled by google-java-format)
-
-=======
->>>>>>> 9cdded6e6 (Restyled by google-java-format)
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
-}
-<<<<<<< HEAD
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
->>>>>>> df6a682b0 (Restyled by whitespace)
+}
\ No newline at end of file
diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 6d1ca37458ea18..6d852b8a36dbc0 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -3,9 +3,6 @@
 
 package chip.devicecontroller;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -19,154 +16,6 @@ import chip.clusterinfo.ClusterCommandCallback;
 import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
 
 
-public class ClusterInfoMapping {
-
-  class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    // Parameters and list-adds here should be generated - refer to the template code that creates each callback interface.
-    @Override
-    public void onSuccess() {
-      List<Object> responseValues = new ArrayList<>();
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception e) {
-      callback.onFailure(e);
-    }
-  }
-  {{#chip_client_clusters}}
-  {{#chip_cluster_responses}}
-      public class Delegated{{asUpperCamelCase name}}Callback implements ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase name}}Callback, DelegatedClusterCallback {
-        private ClusterCommandCallback callback;
-
-        @Override
-        public void setCallbackDelegate(ClusterCommandCallback callback) {
-          this.callback = callback;
-        }
-
-        @Override
-        public void onSuccess(
-        {{#chip_cluster_response_arguments}}
-        {{#if isArray}}
-           // {{asSymbol label}}: {{asUnderlyingZclType type}}
-           // Conversion from this type to Java is not properly implemented yet
-           {{else if (isOctetString type)}}
-              {{omitCommaForFirstNonStatusCommand parent.id index}}byte[] {{asSymbol label}}
-           {{else if (isShortString type)}}
-              {{omitCommaForFirstNonStatusCommand parent.id index}}String {{asSymbol label}}
-           {{else}}
-              {{omitCommaForFirstNonStatusCommand parent.id index}}{{asJavaBasicTypeForZclType type false}} {{asSymbol label}}
-           {{/if}}
-        {{/chip_cluster_response_arguments}}
-        ) {
-           List<Object> responseValues = new ArrayList<>();
-           {{#chip_cluster_response_arguments}}
-             {{#if isArray}}
-               // {{asSymbol label}}: {{asUnderlyingZclType type}}
-               // Conversion from this type to Java is not properly implemented yet
-             {{else}}
-           responseValues.add({{asSymbol label}});
-             {{/if}}
-           {{/chip_cluster_response_arguments}}
-           callback.onSuccess(responseValues);
-        }
-
-        @Override
-        public void onError(Exception error) {
-          callback.onFailure(error);
-        }
-      }
-
-  {{/chip_cluster_responses}}
-  {{/chip_client_clusters}}
-
- public Map<String, ClusterInfo> getClusterMap() {
-     Map<String, ClusterInfo> clusterMap = new HashMap<>();
-     {{#chip_client_clusters}}
-     Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfoMap = new LinkedHashMap<>();
-     {{#chip_cluster_commands}}
-     Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-     // PLEASE UPDATE LATER: fill out parameter types
-     {{#if (zcl_command_arguments_count this.id)}}
-     {{#if hasSpecificResponse}}
-       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
-     {{else}}
-       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
-     {{/if}}
-     {{#chip_cluster_command_arguments_with_structs_expanded}}
-       CommandParameterInfo {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo = new CommandParameterInfo("{{asLowerCamelCase label}}", {{asJavaBasicType type}}.class);
-       {{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}CommandParams.put("{{asLowerCamelCase label}}",{{asLowerCamelCase ../../name}}{{asLowerCamelCase ../name}}{{asLowerCamelCase label}}CommandParameterInfo);
-     {{#not_last}} {{/not_last}}
-     {{/chip_cluster_command_arguments_with_structs_expanded}}
-     {{else}}
-     {{#if hasSpecificResponse}}
-       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
-     {{else}}
-       CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.DefaultClusterCallback.class);
-     {{/if}}
-     {{/if}}
-     // Populate commands
-     {{#if hasSpecificResponse}}
-       CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-           .{{asLowerCamelCase name}}((ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback) callback
-           {{#chip_cluster_command_arguments_with_structs_expanded}},
-           ({{asJavaBoxedType type}})
-           commandArguments.get("{{asLowerCamelCase label}}")
-           {{/chip_cluster_command_arguments_with_structs_expanded}}
-           );
-         },
-         () -> new Delegated{{asUpperCamelCase responseName}}Callback(),
-           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
-       );
-     {{else}}
-       CommandInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo = new CommandInfo(
-         (cluster, callback, commandArguments) -> {
-           ((ChipClusters.{{asUpperCamelCase ../name}}Cluster) cluster)
-           .{{asLowerCamelCase name}}((DefaultClusterCallback) callback
-           {{#chip_cluster_command_arguments_with_structs_expanded}},
-           ({{asJavaBoxedType type}})
-           commandArguments.get("{{asLowerCamelCase label}}")
-           {{/chip_cluster_command_arguments_with_structs_expanded}}
-           );
-         },
-         () -> new DelegatedDefaultClusterCallback(),
-           {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams
-       );
-     {{/if}}
-       {{asLowerCamelCase ../name}}ClusterCommandInfoMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandInfo);
-     {{/chip_cluster_commands}}
-     // Populate cluster
-     ClusterInfo {{asLowerCamelCase name}}ClusterInfo = new ClusterInfo(
-       (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfoMap);
-     clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
-     {{/chip_client_clusters}}
-     return clusterMap;
-=======
-import java.util.List;
-=======
-import java.util.*;
-=======
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
->>>>>>> ef97f0702 (resolve type, nullable and format comments)
-import chip.clusterinfo.ClusterInfo;
-import chip.clusterinfo.CommandInfo;
-import chip.clusterinfo.CommandParameterInfo;
-import chip.clusterinfo.DelegatedClusterCallback;
-import chip.clusterinfo.ClusterCommandCallback;
-import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-
->>>>>>> a4fd0282e (no error code generation)
-
 public class ClusterInfoMapping {
 
   class DelegatedDefaultClusterCallback implements DefaultClusterCallback, DelegatedClusterCallback {
@@ -297,16 +146,8 @@ public class ClusterInfoMapping {
        (ptr, endpointId) -> new ChipClusters.{{asUpperCamelCase name}}Cluster(ptr, endpointId), {{asLowerCamelCase name}}ClusterCommandInfoMap);
      clusterMap.put("{{asLowerCamelCase name}}", {{asLowerCamelCase name}}ClusterInfo);
      {{/chip_client_clusters}}
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
-     return clusterInfoMapping;
->>>>>>> a4fd0282e (no error code generation)
-=======
      return clusterMap;
->>>>>>> 2d2bbd2e1 (new design solution)
   }
 }
 
-{{/if}}
+{{/if}}
\ No newline at end of file
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index a285dc77e107eb..f1504aaaad7a73 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -38,20 +38,8 @@
         },
         {
             "path": "ClusterInfo-java.zapt",
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> fde1d13c0 (fix comments)
             "name": "Cluster information mapping for Java",
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
-=======
-            "name": "ClusterInfo Maping for Java",
-<<<<<<< HEAD
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfo.java"
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
-            "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
->>>>>>> a4fd0282e (no error code generation)
         }
     ]
-}
+}
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
index 51ace595fe40b1..aba0a78fd2c673 100644
--- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp
@@ -5899,8 +5899,6 @@ class CHIPTestClusterClusterTestAddArgumentsResponseCallback
     jobject javaCallbackRef;
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 class CHIPTestClusterClusterTestEnumsResponseCallback : public Callback::Callback<TestClusterClusterTestEnumsResponseCallback>
 {
 public:
@@ -5971,13 +5969,6 @@ class CHIPTestClusterClusterTestEnumsResponseCallback : public Callback::Callbac
 
 class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
     : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
-=======
-class CHIPTestClusterClusterTestListInt8UReverseResponseCallback : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-class CHIPTestClusterClusterTestListInt8UReverseResponseCallback
-    : public Callback::Callback<TestClusterClusterTestListInt8UReverseResponseCallback>
->>>>>>> 698449e64 (add recycler view to display endpoint)
 {
 public:
     CHIPTestClusterClusterTestListInt8UReverseResponseCallback(jobject javaCallback) :
@@ -7658,8 +7649,6 @@ class CHIPOperationalCredentialsFabricsListAttributeCallback
     jobject javaCallbackRef;
 };
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
     : public Callback::Callback<OperationalCredentialsTrustedRootCertificatesListAttributeCallback>
 {
@@ -7735,13 +7724,6 @@ class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback
 
 class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
     : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
-=======
-class CHIPPowerSourceActiveBatteryFaultsAttributeCallback : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-class CHIPPowerSourceActiveBatteryFaultsAttributeCallback
-    : public Callback::Callback<PowerSourceActiveBatteryFaultsListAttributeCallback>
->>>>>>> 677ef48a5 (callback generation done)
 {
 public:
     CHIPPowerSourceActiveBatteryFaultsAttributeCallback(jobject javaCallback) :
@@ -12122,17 +12104,8 @@ JNI_METHOD(void, ColorControlCluster, colorLoopSet)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, static_cast<uint8_t>(action),
                                    static_cast<uint8_t>(direction), time, startHue, optionsMask, optionsOverride);
-=======
-    err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, action, direction, time, startHue, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->ColorLoopSet(onSuccess->Cancel(), onFailure->Cancel(), updateFlags, action, direction, time, startHue,
-                                   optionsMask, optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12228,17 +12201,8 @@ JNI_METHOD(void, ColorControlCluster, enhancedMoveToHue)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, static_cast<uint8_t>(direction),
                                         transitionTime, optionsMask, optionsOverride);
-=======
-    err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, direction, transitionTime, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->EnhancedMoveToHue(onSuccess->Cancel(), onFailure->Cancel(), enhancedHue, direction, transitionTime,
-                                        optionsMask, optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12335,17 +12299,8 @@ JNI_METHOD(void, ColorControlCluster, enhancedStepHue)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                       transitionTime, optionsMask, optionsOverride);
-=======
-    err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->EnhancedStepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
-                                      optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12440,17 +12395,8 @@ JNI_METHOD(void, ColorControlCluster, moveColorTemperature)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(moveMode), rate,
                                            colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
-=======
-    err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->MoveColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), moveMode, rate, colorTemperatureMinimum,
-                                           colorTemperatureMaximum, optionsMask, optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12692,17 +12638,8 @@ JNI_METHOD(void, ColorControlCluster, moveToHue)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, static_cast<uint8_t>(direction), transitionTime,
                                 optionsMask, optionsOverride);
-=======
-    err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->MoveToHue(onSuccess->Cancel(), onFailure->Cancel(), hue, direction, transitionTime, optionsMask,
-                                optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12897,18 +12834,9 @@ JNI_METHOD(void, ColorControlCluster, stepColorTemperature)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                            transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask,
                                            optionsOverride);
-=======
-    err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->StepColorTemperature(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime,
-                                           colorTemperatureMinimum, colorTemperatureMaximum, optionsMask, optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -12956,17 +12884,8 @@ JNI_METHOD(void, ColorControlCluster, stepHue)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                               optionsMask, optionsOverride);
-=======
-    err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->StepHue(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
-                              optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -13014,17 +12933,8 @@ JNI_METHOD(void, ColorControlCluster, stepSaturation)
     cppCluster = reinterpret_cast<ColorControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize,
                                      transitionTime, optionsMask, optionsOverride);
-=======
-    err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask, optionsOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->StepSaturation(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionsMask,
-                                     optionsOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -15390,19 +15300,9 @@ JNI_METHOD(void, DiagnosticLogsCluster, retrieveLogsRequest)
     cppCluster = reinterpret_cast<DiagnosticLogsCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->RetrieveLogsRequest(
         onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(intent), static_cast<uint8_t>(requestedProtocol),
         chip::ByteSpan((const uint8_t *) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
-=======
-    err = cppCluster->RetrieveLogsRequest(onSuccess->Cancel(), onFailure->Cancel(), intent, requestedProtocol, chip::ByteSpan((const uint8_t*) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->RetrieveLogsRequest(
-        onSuccess->Cancel(), onFailure->Cancel(), intent, requestedProtocol,
-        chip::ByteSpan((const uint8_t *) transferFileDesignatorArr.data(), transferFileDesignatorArr.size()));
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -16232,17 +16132,8 @@ JNI_METHOD(void, DoorLockCluster, setPin)
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                              static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
-=======
-    err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) pinArr.data(), pinArr.size()));
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->SetPin(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-                             chip::ByteSpan((const uint8_t *) pinArr.data(), pinArr.size()));
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -16292,17 +16183,8 @@ JNI_METHOD(void, DoorLockCluster, setRfid)
     cppCluster = reinterpret_cast<DoorLockCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, static_cast<uint8_t>(userStatus),
                               static_cast<uint8_t>(userType), chip::ByteSpan((const uint8_t *) idArr.data(), idArr.size()));
-=======
-    err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType, chip::ByteSpan((const uint8_t*) idArr.data(), idArr.size()));
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->SetRfid(onSuccess->Cancel(), onFailure->Cancel(), userId, userStatus, userType,
-                              chip::ByteSpan((const uint8_t *) idArr.data(), idArr.size()));
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -17511,8 +17393,6 @@ JNI_METHOD(void, FlowMeasurementCluster, readMaxMeasuredValueAttribute)
     onFailure.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, FlowMeasurementCluster, readToleranceAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -17540,13 +17420,6 @@ JNI_METHOD(void, FlowMeasurementCluster, readToleranceAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, FlowMeasurementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
@@ -17698,28 +17571,9 @@ JNI_METHOD(void, GeneralCommissioningCluster, setRegulatoryConfig)
     cppCluster = reinterpret_cast<GeneralCommissioningCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(location),
                                           chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb,
                                           timeoutMs);
-=======
-    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location, chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb, timeoutMs);
-=======
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
-    err = cppCluster->SetRegulatoryConfig(onSuccess->Cancel(), onFailure->Cancel(), location,
-                                          chip::CharSpan(countryCodeStr.c_str(), strlen(countryCodeStr.c_str())), breadcrumb,
-                                          timeoutMs);
-<<<<<<< HEAD
->>>>>>> b8d7ee0e3 (callback generation done)
->>>>>>> 677ef48a5 (callback generation done)
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -19216,17 +19070,8 @@ JNI_METHOD(void, LevelControlCluster, step)
     cppCluster = reinterpret_cast<LevelControlCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), static_cast<uint8_t>(stepMode), stepSize, transitionTime,
                            optionMask, optionOverride);
-=======
-    err = cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err =
-        cppCluster->Step(onSuccess->Cancel(), onFailure->Cancel(), stepMode, stepSize, transitionTime, optionMask, optionOverride);
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -21793,30 +21638,10 @@ JNI_METHOD(void, OtaSoftwareUpdateProviderCluster, queryImage)
     cppCluster = reinterpret_cast<OtaSoftwareUpdateProviderCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
                                  static_cast<uint8_t>(protocolsSupported),
                                  chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent,
                                  chip::ByteSpan((const uint8_t *) metadataForProviderArr.data(), metadataForProviderArr.size()));
-=======
-    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion, protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())), requestorCanConsent, chip::ByteSpan((const uint8_t*) metadataForProviderArr.data(), metadataForProviderArr.size()));
-=======
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
-    err = cppCluster->QueryImage(onSuccess->Cancel(), onFailure->Cancel(), vendorId, productId, hardwareVersion, softwareVersion,
-                                 protocolsSupported, chip::CharSpan(locationStr.c_str(), strlen(locationStr.c_str())),
-                                 requestorCanConsent,
-                                 chip::ByteSpan((const uint8_t *) metadataForProviderArr.data(), metadataForProviderArr.size()));
-<<<<<<< HEAD
->>>>>>> b8d7ee0e3 (callback generation done)
->>>>>>> 677ef48a5 (callback generation done)
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -21881,33 +21706,14 @@ JNI_METHOD(jlong, OtaSoftwareUpdateRequestorCluster, initWithDevice)(JNIEnv * en
     return reinterpret_cast<jlong>(cppCluster);
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jlong providerLocation, jint vendorId, jint announcementReason,
  jbyteArray metadataForNode)
-=======
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId, jint announcementReason, jbyteArray metadataForNode)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jbyteArray providerLocation, jint vendorId,
- jint announcementReason, jbyteArray metadataForNode)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
     OtaSoftwareUpdateRequestorCluster * cppCluster;
-<<<<<<< HEAD
-<<<<<<< HEAD
 
-=======
-    
-=======
-
->>>>>>> 677ef48a5 (callback generation done)
-    JniByteArray providerLocationArr(env, providerLocation);
->>>>>>> e83b94d19 (need to wait for cast-helper)
     JniByteArray metadataForNodeArr(env, metadataForNode);
 
     std::unique_ptr<CHIPDefaultSuccessCallback, void (*)(CHIPDefaultSuccessCallback *)> onSuccess(
@@ -21920,20 +21726,9 @@ JNI_METHOD(void, OtaSoftwareUpdateRequestorCluster, announceOtaProvider)
     cppCluster = reinterpret_cast<OtaSoftwareUpdateRequestorCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), providerLocation,
                                           static_cast<chip::VendorId>(vendorId), static_cast<uint8_t>(announcementReason),
                                           chip::ByteSpan((const uint8_t *) metadataForNodeArr.data(), metadataForNodeArr.size()));
-=======
-    err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(), chip::ByteSpan((const uint8_t*) providerLocationArr.data(), providerLocationArr.size()), vendorId, announcementReason, chip::ByteSpan((const uint8_t*) metadataForNodeArr.data(), metadataForNodeArr.size()));
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->AnnounceOtaProvider(onSuccess->Cancel(), onFailure->Cancel(),
-                                          chip::ByteSpan((const uint8_t *) providerLocationArr.data(), providerLocationArr.size()),
-                                          vendorId, announcementReason,
-                                          chip::ByteSpan((const uint8_t *) metadataForNodeArr.data(), metadataForNodeArr.size()));
->>>>>>> 677ef48a5 (callback generation done)
     SuccessOrExit(err);
 
 exit:
@@ -23483,8 +23278,6 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCommissionedFabricsAttribute
     onFailure.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, OperationalCredentialsCluster, readTrustedRootCertificatesAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -23541,13 +23334,6 @@ JNI_METHOD(void, OperationalCredentialsCluster, readCurrentFabricIndexAttribute)
 
 JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, OperationalCredentialsCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
@@ -24936,8 +24722,6 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, readMaxMeasuredValueAttribu
     onFailure.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -25014,13 +24798,6 @@ JNI_METHOD(void, RelativeHumidityMeasurementCluster, reportToleranceAttribute)
 
 JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, RelativeHumidityMeasurementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
@@ -26334,8 +26111,6 @@ JNI_METHOD(void, TemperatureMeasurementCluster, readMaxMeasuredValueAttribute)
     onFailure.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, TemperatureMeasurementCluster, readToleranceAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -26412,13 +26187,6 @@ JNI_METHOD(void, TemperatureMeasurementCluster, reportToleranceAttribute)
 
 JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, TemperatureMeasurementCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
@@ -26546,8 +26314,6 @@ JNI_METHOD(void, TestClusterCluster, testAddArguments)
         onFailure.release();
     }
 }
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, TestClusterCluster, testEnumsRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1, jint arg2)
 {
@@ -26599,13 +26365,6 @@ JNI_METHOD(void, TestClusterCluster, testEnumsRequest)
 }
 JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
-=======
-JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, TestClusterCluster, testListInt8UArgumentRequest)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jint arg1)
->>>>>>> 698449e64 (add recycler view to display endpoint)
 {
     chip::DeviceLayer::StackLock lock;
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -26720,19 +26479,9 @@ JNI_METHOD(void, TestClusterCluster, testListStructArgumentRequest)
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                     chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
                                                     chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
-=======
-    err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->TestListStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c,
-                                                    chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
-                                                    chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
->>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -26925,19 +26674,9 @@ JNI_METHOD(void, TestClusterCluster, testStructArgumentRequest)
     cppCluster = reinterpret_cast<TestClusterCluster *>(clusterPtr);
     VerifyOrExit(cppCluster != nullptr, err = CHIP_ERROR_INCORRECT_STATE);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, static_cast<uint8_t>(c),
                                                 chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
                                                 chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
-=======
-    err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c, chip::ByteSpan((const uint8_t*) dArr.data(), dArr.size()), chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    err = cppCluster->TestStructArgumentRequest(onSuccess->Cancel(), onFailure->Cancel(), a, b, c,
-                                                chip::ByteSpan((const uint8_t *) dArr.data(), dArr.size()),
-                                                chip::CharSpan(eStr.c_str(), strlen(eStr.c_str())), f);
->>>>>>> 698449e64 (add recycler view to display endpoint)
     SuccessOrExit(err);
 
 exit:
@@ -29032,8 +28771,6 @@ JNI_METHOD(void, ThermostatCluster, writeMaxCoolSetpointLimitAttribute)
     onFailure.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, ThermostatCluster, readMinSetpointDeadBandAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
@@ -29088,13 +28825,6 @@ JNI_METHOD(void, ThermostatCluster, writeMinSetpointDeadBandAttribute)
 
 JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, ThermostatCluster, readControlSequenceOfOperationAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt8uAttributeCallback, void (*)(CHIPInt8uAttributeCallback *)> onSuccess(
@@ -32934,8 +32664,6 @@ JNI_METHOD(void, WindowCoveringCluster, reportSafetyStatusAttribute)(JNIEnv * en
     onReport.release();
 }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 JNI_METHOD(void, WindowCoveringCluster, readFeatureMapAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
 {
     chip::DeviceLayer::StackLock lock;
@@ -32963,13 +32691,6 @@ JNI_METHOD(void, WindowCoveringCluster, readFeatureMapAttribute)(JNIEnv * env, j
 
 JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
 (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
-=======
-JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-JNI_METHOD(void, WindowCoveringCluster, readClusterRevisionAttribute)
-(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback)
->>>>>>> 677ef48a5 (callback generation done)
 {
     chip::DeviceLayer::StackLock lock;
     std::unique_ptr<CHIPInt16uAttributeCallback, void (*)(CHIPInt16uAttributeCallback *)> onSuccess(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 322470d3ca00ee..fb8376fc6499d3 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -3004,8 +3004,6 @@ public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -3028,46 +3026,6 @@ private native void readToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-  
-    private native void readMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    private native void readMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMinMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readMaxMeasuredValueAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class GeneralCommissioningCluster extends BaseChipCluster {
@@ -4527,16 +4485,9 @@ public static long clusterId() {
     @Override
     public native long initWithDevice(long devicePtr, int endpointId);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void announceOtaProvider(
         DefaultClusterCallback callback,
         long providerLocation,
-=======
-    public void announceOtaProvider(
-        DefaultClusterCallback callback,
-        byte[] providerLocation,
->>>>>>> 677ef48a5 (callback generation done)
         int vendorId,
         int announcementReason,
         byte[] metadataForNode) {
@@ -4547,7 +4498,6 @@ public void announceOtaProvider(
           vendorId,
           announcementReason,
           metadataForNode);
-<<<<<<< HEAD
     }
 
     private native void announceOtaProvider(
@@ -4557,24 +4507,6 @@ private native void announceOtaProvider(
         int vendorId,
         int announcementReason,
         byte[] metadataForNode);
-=======
-    public void announceOtaProvider(DefaultClusterCallback callback, byte[] providerLocation, int vendorId, int announcementReason, byte[] metadataForNode) {
-      announceOtaProvider(chipClusterPtr, callback, providerLocation, vendorId, announcementReason, metadataForNode);
-    }
-
-    private native void announceOtaProvider(long chipClusterPtr, DefaultClusterCallback callback, byte[] providerLocation, int vendorId, int announcementReason, byte[] metadataForNode);
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    }
-
-    private native void announceOtaProvider(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        byte[] providerLocation,
-        int vendorId,
-        int announcementReason,
-        byte[] metadataForNode);
->>>>>>> 677ef48a5 (callback generation done)
 
     public void readDefaultOtaProviderAttribute(OctetStringAttributeCallback callback) {
       readDefaultOtaProviderAttribute(chipClusterPtr, callback);
@@ -4985,8 +4917,6 @@ public interface FabricsListAttributeCallback {
       void onError(Exception ex);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public interface TrustedRootCertificatesAttributeCallback {
       void onSuccess(List<byte[]> valueList);
 
@@ -4994,14 +4924,6 @@ public interface TrustedRootCertificatesAttributeCallback {
     }
 
     public void readFabricsListAttribute(FabricsListAttributeCallback callback) {
-=======
-    public void readFabricsListAttribute(
-      FabricsListAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readFabricsListAttribute(FabricsListAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readFabricsListAttribute(chipClusterPtr, callback);
     }
 
@@ -5013,8 +4935,6 @@ public void readCommissionedFabricsAttribute(IntegerAttributeCallback callback)
       readCommissionedFabricsAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readTrustedRootCertificatesAttribute(
         TrustedRootCertificatesAttributeCallback callback) {
       readTrustedRootCertificatesAttribute(chipClusterPtr, callback);
@@ -5045,46 +4965,6 @@ private native void readCurrentFabricIndexAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-  
-    private native void readFabricsListAttribute(long chipClusterPtr,
-      FabricsListAttributeCallback callback
-    );
-  
-    private native void readSupportedFabricsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readCommissionedFabricsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-      readClusterRevisionAttribute(chipClusterPtr, callback);
-    }
-
-    private native void readFabricsListAttribute(
-        long chipClusterPtr, FabricsListAttributeCallback callback);
-
-    private native void readSupportedFabricsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readCommissionedFabricsAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
-
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class PowerSourceCluster extends BaseChipCluster {
@@ -5494,8 +5374,6 @@ public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -5510,24 +5388,12 @@ public void reportToleranceAttribute(IntegerAttributeCallback callback) {
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
     private native void readMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -5540,7 +5406,6 @@ private native void readMinMeasuredValueAttribute(
     private native void readMaxMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
     private native void readToleranceAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -5552,25 +5417,6 @@ private native void reportToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ScenesCluster extends BaseChipCluster {
@@ -6033,8 +5879,6 @@ public void readMaxMeasuredValueAttribute(IntegerAttributeCallback callback) {
       readMaxMeasuredValueAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readToleranceAttribute(IntegerAttributeCallback callback) {
       readToleranceAttribute(chipClusterPtr, callback);
     }
@@ -6049,24 +5893,12 @@ public void reportToleranceAttribute(IntegerAttributeCallback callback) {
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
     private native void readMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void subscribeMeasuredValueAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int minInterval, int maxInterval);
 
@@ -6079,7 +5911,6 @@ private native void readMinMeasuredValueAttribute(
     private native void readMaxMeasuredValueAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
     private native void readToleranceAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -6091,25 +5922,6 @@ private native void reportToleranceAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    private native void reportMeasuredValueAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readMinMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readMaxMeasuredValueAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class TestClusterCluster extends BaseChipCluster {
@@ -6132,39 +5944,10 @@ public void testAddArguments(TestAddArgumentsResponseCallback callback, int arg1
       testAddArguments(chipClusterPtr, callback, arg1, arg2);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void testEnumsRequest(TestEnumsResponseCallback callback, int arg1, int arg2) {
       testEnumsRequest(chipClusterPtr, callback, arg1, arg2);
     }
-=======
->>>>>>> 677ef48a5 (callback generation done)
-=======
->>>>>>> c49afcc9f (merge conflict)
-
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-=======
-
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> e993d01f0 (callback generation done)
-<<<<<<< HEAD
->>>>>>> 677ef48a5 (callback generation done)
-=======
-=======
->>>>>>> f00108887 (merge conflict)
->>>>>>> c49afcc9f (merge conflict)
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
+
     public void testListInt8UArgumentRequest(DefaultClusterCallback callback, int arg1) {
       testListInt8UArgumentRequest(chipClusterPtr, callback, arg1);
     }
@@ -6183,17 +5966,11 @@ public void testNotHandled(DefaultClusterCallback callback) {
       testNotHandled(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void testNullableOptionalRequest(
         TestNullableOptionalResponseCallback callback, int arg1) {
       testNullableOptionalRequest(chipClusterPtr, callback, arg1);
     }
-=======
->>>>>>> e83b94d19 (need to wait for cast-helper)
 
-=======
->>>>>>> 677ef48a5 (callback generation done)
     public void testSpecific(TestSpecificResponseCallback callback) {
       testSpecific(chipClusterPtr, callback);
     }
@@ -6208,69 +5985,13 @@ public void testUnknownCommand(DefaultClusterCallback callback) {
     }
 
     private native void test(long chipClusterPtr, DefaultClusterCallback callback);
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
 
     private native void testAddArguments(
         long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
 
-<<<<<<< HEAD
     private native void testEnumsRequest(
         long chipClusterPtr, TestEnumsResponseCallback callback, int arg1, int arg2);
 
-=======
-<<<<<<< HEAD
->>>>>>> cdefa1b91 (basic code generation template, but not able to import to tool app)
-    private native void testListInt8UArgumentRequest(
-        long chipClusterPtr, DefaultClusterCallback callback, int arg1);
-
-    private native void testListInt8UReverseRequest(
-        long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
-
-    private native void testListStructArgumentRequest(
-        long chipClusterPtr,
-        DefaultClusterCallback callback,
-        int a,
-        boolean b,
-        int c,
-        byte[] d,
-        String e,
-        int f);
-
-=======
-=======
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
->>>>>>> 677ef48a5 (callback generation done)
-=======
->>>>>>> c49afcc9f (merge conflict)
-    private native void testAddArguments(long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
-    private native void testListInt8UArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int arg1);
-    private native void testListInt8UReverseRequest(long chipClusterPtr, TestListInt8UReverseResponseCallback callback, int arg1);
-    private native void testListStructArgumentRequest(long chipClusterPtr, DefaultClusterCallback callback, int a, boolean b, int c, byte[] d, String e, int f);
-=======
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3edd9cb43 (create new public class under chip/clusterinfo)
-=======
->>>>>>> 6e6e45a1a (callback generation done)
-=======
->>>>>>> f00108887 (merge conflict)
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
-
-    private native void testAddArguments(
-        long chipClusterPtr, TestAddArgumentsResponseCallback callback, int arg1, int arg2);
-
     private native void testListInt8UArgumentRequest(
         long chipClusterPtr, DefaultClusterCallback callback, int arg1);
 
@@ -6288,17 +6009,10 @@ private native void testListStructArgumentRequest(
         int f);
 
     private native void testNotHandled(long chipClusterPtr, DefaultClusterCallback callback);
-<<<<<<< HEAD
-<<<<<<< HEAD
 
     private native void testNullableOptionalRequest(
         long chipClusterPtr, TestNullableOptionalResponseCallback callback, int arg1);
 
-=======
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-
->>>>>>> 677ef48a5 (callback generation done)
     private native void testSpecific(long chipClusterPtr, TestSpecificResponseCallback callback);
 
     private native void testStructArgumentRequest(
@@ -6555,8 +6269,6 @@ public void writeEpochSAttribute(DefaultClusterCallback callback, long value) {
       writeEpochSAttribute(chipClusterPtr, callback, value);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readVendorIdAttribute(IntegerAttributeCallback callback) {
       readVendorIdAttribute(chipClusterPtr, callback);
     }
@@ -6566,14 +6278,6 @@ public void writeVendorIdAttribute(DefaultClusterCallback callback, int value) {
     }
 
     public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
-=======
-    public void readUnsupportedAttribute(
-      BooleanAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readUnsupportedAttribute(BooleanAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readUnsupportedAttribute(chipClusterPtr, callback);
     }
 
@@ -6640,10 +6344,6 @@ private native void writeInt8sAttribute(
 
     private native void readInt16sAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void writeInt16sAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
@@ -6710,15 +6410,12 @@ private native void writeEpochUsAttribute(
     private native void writeEpochSAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, long value);
 
-<<<<<<< HEAD
     private native void readVendorIdAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void writeVendorIdAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void readUnsupportedAttribute(
         long chipClusterPtr, BooleanAttributeCallback callback);
 
@@ -6727,16 +6424,6 @@ private native void writeUnsupportedAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-<<<<<<< HEAD
-=======
-    private native void writeUnsupportedAttribute(long chipClusterPtr, DefaultClusterCallback callback, boolean value);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ThermostatCluster extends BaseChipCluster {
@@ -6878,8 +6565,6 @@ public void writeMaxCoolSetpointLimitAttribute(DefaultClusterCallback callback,
       writeMaxCoolSetpointLimitAttribute(chipClusterPtr, callback, value);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readMinSetpointDeadBandAttribute(IntegerAttributeCallback callback) {
       readMinSetpointDeadBandAttribute(chipClusterPtr, callback);
     }
@@ -6889,14 +6574,6 @@ public void writeMinSetpointDeadBandAttribute(DefaultClusterCallback callback, i
     }
 
     public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
-=======
-    public void readControlSequenceOfOperationAttribute(
-      IntegerAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readControlSequenceOfOperationAttribute(IntegerAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readControlSequenceOfOperationAttribute(chipClusterPtr, callback);
     }
 
@@ -6960,10 +6637,6 @@ private native void readOccupiedCoolingSetpointAttribute(
     private native void writeOccupiedCoolingSetpointAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void readOccupiedHeatingSetpointAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -6994,15 +6667,12 @@ private native void readMaxCoolSetpointLimitAttribute(
     private native void writeMaxCoolSetpointLimitAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-<<<<<<< HEAD
     private native void readMinSetpointDeadBandAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
     private native void writeMinSetpointDeadBandAttribute(
         long chipClusterPtr, DefaultClusterCallback callback, int value);
 
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void readControlSequenceOfOperationAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -7029,32 +6699,6 @@ private native void readFeatureMapAttribute(
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-<<<<<<< HEAD
-=======
-    private native void writeSystemModeAttribute(long chipClusterPtr, DefaultClusterCallback callback, int value);
-  
-    private native void readStartOfWeekAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readNumberOfWeeklyTransitionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readNumberOfDailyTransitionsAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
-  
-    private native void readFeatureMapAttribute(long chipClusterPtr,
-      LongAttributeCallback callback
-    );
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
->>>>>>> 677ef48a5 (callback generation done)
   }
 
   public static class ThermostatUserInterfaceConfigurationCluster extends BaseChipCluster {
@@ -8116,21 +7760,11 @@ public void reportSafetyStatusAttribute(IntegerAttributeCallback callback) {
       reportSafetyStatusAttribute(chipClusterPtr, callback);
     }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     public void readFeatureMapAttribute(LongAttributeCallback callback) {
       readFeatureMapAttribute(chipClusterPtr, callback);
     }
 
     public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
-=======
-    public void readClusterRevisionAttribute(
-      IntegerAttributeCallback callback
-    ) {
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    public void readClusterRevisionAttribute(IntegerAttributeCallback callback) {
->>>>>>> 677ef48a5 (callback generation done)
       readClusterRevisionAttribute(chipClusterPtr, callback);
     }
 
@@ -8181,10 +7815,6 @@ private native void subscribeTargetPositionLiftPercent100thsAttribute(
     private native void reportTargetPositionLiftPercent100thsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 677ef48a5 (callback generation done)
     private native void readTargetPositionTiltPercent100thsAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
@@ -8241,22 +7871,10 @@ private native void subscribeSafetyStatusAttribute(
     private native void reportSafetyStatusAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
 
-<<<<<<< HEAD
     private native void readFeatureMapAttribute(
         long chipClusterPtr, LongAttributeCallback callback);
 
     private native void readClusterRevisionAttribute(
         long chipClusterPtr, IntegerAttributeCallback callback);
-=======
-    private native void reportSafetyStatusAttribute(long chipClusterPtr, IntegerAttributeCallback callback);
-  
-    private native void readClusterRevisionAttribute(long chipClusterPtr,
-      IntegerAttributeCallback callback
-    );
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
-    private native void readClusterRevisionAttribute(
-        long chipClusterPtr, IntegerAttributeCallback callback);
->>>>>>> 677ef48a5 (callback generation done)
   }
 }
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index a6ef53e41164a0..27a757a2a31c92 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -19,14 +19,7 @@
 
 package chip.devicecontroller;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 import chip.clusterinfo.ClusterCommandCallback;
-=======
-import java.util.*;
->>>>>>> e83b94d19 (need to wait for cast-helper)
 import chip.clusterinfo.ClusterInfo;
 import chip.clusterinfo.CommandInfo;
 import chip.clusterinfo.CommandParameterInfo;
@@ -184,7 +177,6 @@ public void onError(Exception error) {
     }
   }
 
-<<<<<<< HEAD
   public class DelegatedClearAllPinsResponseCallback
       implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback,
           DelegatedClusterCallback {
@@ -1921,7 +1913,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> accountLoginClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo accountLogingetSetupPINCommandParameterInfo =
         new CommandParameterInfo(
             "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
@@ -1944,7 +1936,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     accountLoginClusterCommandInfoMap.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
     Map<String, CommandParameterInfo> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo accountLoginloginCommandParameterInfo =
         new CommandParameterInfo("AccountLogin", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
@@ -1980,7 +1972,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenBasicCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo
         administratorCommissioningopenBasicCommissioningWindowCommandParameterInfo =
             new CommandParameterInfo(
@@ -2009,7 +2001,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo administratorCommissioningopenCommissioningWindowCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2073,7 +2065,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
     Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo administratorCommissioningrevokeCommissioningCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2098,7 +2090,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationBasicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationBasicchangeStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo applicationBasicchangeStatusCommandParameterInfo =
         new CommandParameterInfo("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo =
@@ -2127,7 +2119,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo applicationLauncherlaunchAppCommandParameterInfo =
         new CommandParameterInfo(
             "ApplicationLauncher",
@@ -2171,7 +2163,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> audioOutputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo audioOutputrenameOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
@@ -2199,7 +2191,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     audioOutputClusterCommandInfoMap.put("renameOutput", audioOutputrenameOutputCommandInfo);
     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo audioOutputselectOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
@@ -2227,7 +2219,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> barrierControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlGoToPercentCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
@@ -2250,7 +2242,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
     Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlStopCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2273,7 +2265,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> basicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> basicmfgSpecificPingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo basicmfgSpecificPingCommandParameterInfo =
         new CommandParameterInfo("Basic", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2302,7 +2294,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bindingClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bindingbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bindingbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingbindnodeIdCommandParameterInfo =
@@ -2338,7 +2330,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     bindingClusterCommandInfoMap.put("bind", bindingbindCommandInfo);
     Map<String, CommandParameterInfo> bindingunbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bindingunbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingunbindnodeIdCommandParameterInfo =
@@ -2388,7 +2380,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bridgedActionsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
@@ -2417,7 +2409,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableAction", bridgedActionsdisableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
@@ -2452,7 +2444,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableActionWithDuration", bridgedActionsdisableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
@@ -2480,7 +2472,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("enableAction", bridgedActionsenableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
@@ -2515,7 +2507,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enableActionWithDuration", bridgedActionsenableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
@@ -2544,7 +2536,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantAction", bridgedActionsinstantActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionWithTransitionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
@@ -2581,7 +2573,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantActionWithTransition", bridgedActionsinstantActionWithTransitionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
@@ -2609,7 +2601,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("pauseAction", bridgedActionspauseActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
@@ -2644,7 +2636,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "pauseActionWithDuration", bridgedActionspauseActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsresumeActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
@@ -2672,7 +2664,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("resumeAction", bridgedActionsresumeActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
@@ -2700,7 +2692,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("startAction", bridgedActionsstartActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
@@ -2735,7 +2727,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "startActionWithDuration", bridgedActionsstartActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstopActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
@@ -2777,7 +2769,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> colorControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlcolorLoopSetCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
@@ -2835,7 +2827,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
@@ -2876,7 +2868,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
@@ -2923,7 +2915,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
@@ -2974,7 +2966,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedStepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
@@ -3021,7 +3013,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedStepHue", colorControlenhancedStepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
@@ -3059,7 +3051,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveColor", colorControlmoveColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
@@ -3116,7 +3108,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
@@ -3155,7 +3147,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveHue", colorControlmoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
@@ -3195,7 +3187,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveSaturation", colorControlmoveSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
@@ -3241,7 +3233,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToColor", colorControlmoveToColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
@@ -3282,7 +3274,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
@@ -3327,7 +3319,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToHue", colorControlmoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
@@ -3374,7 +3366,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
@@ -3415,7 +3407,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToSaturation", colorControlmoveToSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
@@ -3459,7 +3451,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepColor", colorControlstepColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
@@ -3522,7 +3514,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
@@ -3568,7 +3560,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepHue", colorControlstepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
@@ -3614,7 +3606,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepSaturation", colorControlstepSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo colorControlstopMoveStepCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
@@ -3649,7 +3641,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> contentLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo contentLauncherlaunchContentCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher",
@@ -3680,7 +3672,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "launchContent", contentLauncherlaunchContentCommandInfo);
     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo contentLauncherlaunchURLCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
@@ -3723,7 +3715,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> diagnosticLogsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "DiagnosticLogs",
@@ -3770,7 +3762,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> doorLockClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> doorLockclearAllPinsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearAllPinsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
@@ -3787,7 +3779,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllPins", doorLockclearAllPinsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearAllRfidsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearAllRfidsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
@@ -3804,7 +3796,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
@@ -3828,7 +3820,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
@@ -3850,7 +3842,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearPin", doorLockclearPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
@@ -3872,7 +3864,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearRfid", doorLockclearRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
@@ -3902,7 +3894,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
@@ -3932,7 +3924,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
@@ -3955,7 +3947,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetLogRecordCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetLogRecordCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
@@ -3978,7 +3970,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getLogRecord", doorLockgetLogRecordCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
@@ -4000,7 +3992,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getPin", doorLockgetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
@@ -4022,7 +4014,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getRfid", doorLockgetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
@@ -4044,7 +4036,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getUserType", doorLockgetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
@@ -4073,7 +4065,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
@@ -4102,7 +4094,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocklockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
@@ -4124,7 +4116,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("lockDoor", doorLocklockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
@@ -4166,7 +4158,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
@@ -4203,7 +4195,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setPin", doorLocksetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
@@ -4240,7 +4232,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setRfid", doorLocksetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
@@ -4268,7 +4260,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setUserType", doorLocksetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
@@ -4327,7 +4319,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
@@ -4368,7 +4360,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockunlockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
@@ -4390,7 +4382,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("unlockDoor", doorLockunlockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo doorLockunlockWithTimeoutCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
@@ -4434,7 +4426,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo ethernetNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -4473,7 +4465,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> generalCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningarmFailSafeCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4512,7 +4504,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningcommissioningCompleteCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4533,7 +4525,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningsetRegulatoryConfigCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4598,7 +4590,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> groupsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsaddGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
@@ -4625,7 +4617,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("addGroup", groupsaddGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsaddGroupIfIdentifyingCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
@@ -4654,7 +4646,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsgetGroupMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
@@ -4683,7 +4675,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsremoveAllGroupsCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -4698,7 +4690,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsremoveGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
@@ -4720,7 +4712,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeGroup", groupsremoveGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo groupsviewGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
@@ -4749,7 +4741,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> identifyClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo identifyidentifyCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
@@ -4771,7 +4763,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identify", identifyidentifyCommandInfo);
     Map<String, CommandParameterInfo> identifyidentifyQueryCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo identifyidentifyQueryCommandParameterInfo =
         new CommandParameterInfo(
             "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
@@ -4788,7 +4780,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identifyQuery", identifyidentifyQueryCommandInfo);
     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo identifytriggerEffectCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
@@ -4830,7 +4822,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> keypadInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo keypadInputsendKeyCommandParameterInfo =
         new CommandParameterInfo(
             "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
@@ -4859,7 +4851,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> levelControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
@@ -4896,7 +4888,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("move", levelControlmoveCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
@@ -4936,7 +4928,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveToLevel", levelControlmoveToLevelCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
@@ -4965,7 +4957,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
@@ -4993,7 +4985,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlstepCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
@@ -5036,7 +5028,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("step", levelControlstepCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlstepWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
@@ -5070,7 +5062,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlstopCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
@@ -5097,7 +5089,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stop", levelControlstopCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo levelControlstopWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5119,7 +5111,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> lowPowerClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> lowPowersleepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo lowPowersleepCommandParameterInfo =
         new CommandParameterInfo("LowPower", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5140,7 +5132,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaInputhideInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5155,7 +5147,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaInputrenameInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
@@ -5181,7 +5173,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("renameInput", mediaInputrenameInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaInputselectInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
@@ -5201,7 +5193,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("selectInput", mediaInputselectInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaInputshowInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5223,7 +5215,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaPlaybackClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaPlaybackmediaFastForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaFastForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5243,7 +5235,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaNextCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaNextCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
@@ -5260,7 +5252,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPauseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPauseCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
@@ -5277,7 +5269,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPlayCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPlayCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
@@ -5294,7 +5286,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPreviousCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPreviousCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
@@ -5311,7 +5303,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaRewindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaRewindCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
@@ -5328,7 +5320,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSeekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSeekCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
@@ -5351,7 +5343,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipBackwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5379,7 +5371,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5406,7 +5398,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStartOverCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStartOverCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5425,7 +5417,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStopCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
@@ -5449,7 +5441,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> networkCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> networkCommissioningaddThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningaddThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5489,7 +5481,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningaddWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningaddWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5533,7 +5525,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningdisableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningdisableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5571,7 +5563,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningenableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningenableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5610,7 +5602,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         networkCommissioninggetLastNetworkCommissioningResultCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioninggetLastNetworkCommissioningResultCommandParameterInfo =
         new CommandParameterInfo("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -5635,7 +5627,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningremoveNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5673,7 +5665,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningscanNetworksCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5711,7 +5703,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "scanNetworks", networkCommissioningscanNetworksCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningupdateThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5751,7 +5743,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningupdateWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5802,7 +5794,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5836,7 +5828,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
@@ -5869,7 +5861,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5950,7 +5942,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
@@ -6013,7 +6005,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> onOffClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> onOffoffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOffoffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6027,7 +6019,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("off", onOffoffCommandInfo);
     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOffoffWithEffectCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
@@ -6054,7 +6046,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("offWithEffect", onOffoffWithEffectCommandInfo);
     Map<String, CommandParameterInfo> onOffonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOffonCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6068,7 +6060,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("on", onOffonCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOffonWithRecallGlobalSceneCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6084,7 +6076,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOffonWithTimedOffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
@@ -6117,7 +6109,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
     Map<String, CommandParameterInfo> onOfftoggleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo onOfftoggleCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6145,7 +6137,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> operationalCredentialsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsaddNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6194,7 +6186,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addNOC", operationalCredentialsaddNOCCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsaddTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6220,7 +6212,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsattestationRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6248,7 +6240,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialscertificateChainRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6276,7 +6268,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsopCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsopCSRRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6301,7 +6293,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveFabricCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6327,7 +6319,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         operationalCredentialsremoveTrustedRootCertificateCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6354,7 +6346,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         operationalCredentialsremoveTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateFabricLabelCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6379,7 +6371,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6449,7 +6441,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> scenesClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesaddSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
@@ -6502,7 +6494,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("addScene", scenesaddSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesgetSceneMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
@@ -6525,7 +6517,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesrecallSceneCommandParameterInfo =
         new CommandParameterInfo("Scenes", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
@@ -6557,7 +6549,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("recallScene", scenesrecallSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesremoveAllScenesCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
@@ -6580,7 +6572,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesremoveSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
@@ -6607,7 +6599,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeScene", scenesremoveSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesstoreSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
@@ -6634,7 +6626,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("storeScene", scenesstoreSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo scenesviewSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
@@ -6668,7 +6660,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo softwareDiagnosticsresetWatermarksCommandParameterInfo =
         new CommandParameterInfo("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6698,7 +6690,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> tvChannelClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> tvChannelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelCommandParameterInfo =
         new CommandParameterInfo(
             "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
@@ -6721,7 +6713,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     tvChannelClusterCommandInfoMap.put("changeChannel", tvChannelchangeChannelCommandInfo);
     Map<String, CommandParameterInfo> tvChannelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelByNumberCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo =
@@ -6750,7 +6742,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
     Map<String, CommandParameterInfo> tvChannelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo tvChannelskipChannelCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelskipChannelcountCommandParameterInfo =
@@ -6777,7 +6769,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> targetNavigatorClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo targetNavigatornavigateTargetCommandParameterInfo =
         new CommandParameterInfo(
             "TargetNavigator",
@@ -6822,7 +6814,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> testClusterClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> testClustertestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6836,7 +6828,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("test", testClustertestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestAddArgumentsCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
@@ -6866,7 +6858,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testAddArguments", testClustertestAddArgumentsCommandInfo);
     Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestEnumsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestEnumsResponseCallback.class);
@@ -6896,7 +6888,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testEnumsRequest", testClustertestEnumsRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListInt8UArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
@@ -6918,7 +6910,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListInt8UReverseRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -6944,7 +6936,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
@@ -6997,7 +6989,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestNotHandledCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7012,7 +7004,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testNotHandled", testClustertestNotHandledCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestNullableOptionalRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -7038,7 +7030,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testNullableOptionalRequest", testClustertestNullableOptionalRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestSpecificCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
@@ -7055,7 +7047,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testSpecific", testClustertestSpecificCommandInfo);
     Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestStructArgumentRequestaCommandParameterInfo =
@@ -7108,7 +7100,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo testClustertestUnknownCommandCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7131,7 +7123,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> thermostatClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo thermostatclearWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7147,7 +7139,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo thermostatgetRelayStatusLogCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7163,7 +7155,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo thermostatgetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
@@ -7192,7 +7184,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo thermostatsetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -7236,7 +7228,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo thermostatsetpointRaiseLowerCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
@@ -7282,7 +7274,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo threadNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7313,7 +7305,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo wiFiNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7337,7 +7329,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> windowCoveringClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringdownOrCloseCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7352,7 +7344,7 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringClusterCommandInfoMap.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo =
@@ -7384,7 +7376,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
@@ -7407,7 +7399,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo =
@@ -7439,7 +7431,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
@@ -7462,7 +7454,7 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
+    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringstopMotionCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7475,13726 +7467,17 @@ public Map<String, ClusterInfo> getClusterMap() {
             () -> new DelegatedDefaultClusterCallback(),
             windowCoveringstopMotionCommandParams);
     windowCoveringClusterCommandInfoMap.put("stopMotion", windowCoveringstopMotionCommandInfo);
-    Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // PLEASE UPDATE LATER: fill out parameter types
-    CommandParameterInfo windowCoveringupOrOpenCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    // Populate commands
-    CommandInfo windowCoveringupOrOpenCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .upOrOpen((DefaultClusterCallback) callback);
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            windowCoveringupOrOpenCommandParams);
-    windowCoveringClusterCommandInfoMap.put("upOrOpen", windowCoveringupOrOpenCommandInfo);
-    // Populate cluster
-    ClusterInfo windowCoveringClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId),
-            windowCoveringClusterCommandInfoMap);
-    clusterMap.put("windowCovering", windowCoveringClusterInfo);
-    return clusterMap;
-=======
-=======
-import chip.clusterinfo.ClusterCommandCallback;
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
-import chip.clusterinfo.ClusterCommandCallback;
->>>>>>> 677ef48a5 (callback generation done)
-import chip.clusterinfo.ClusterInfo;
-import chip.clusterinfo.CommandInfo;
-import chip.clusterinfo.CommandParameterInfo;
-import chip.clusterinfo.DelegatedClusterCallback;
-import chip.devicecontroller.ChipClusters.DefaultClusterCallback;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class ClusterInfoMapping {
-
-  class DelegatedDefaultClusterCallback
-      implements DefaultClusterCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    // Parameters and list-adds here should be generated - refer to the template code that creates
-    // each callback interface.
-    @Override
-    public void onSuccess() {
-      List<Object> responseValues = new ArrayList<>();
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception e) {
-      callback.onFailure(e);
-    }
-  }
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-  public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
-    List<CommandParameter> accountLogin_getSetupPIN_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getSetupPIN_tempAccountIdentifier_commandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_getSetupPIN_commandParams.add(getSetupPIN_tempAccountIdentifier_commandParameter);
-=======
-  public class DelegatedGetSetupPINResponseCallback
-      implements ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(String setupPIN) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(setupPIN);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedLaunchAppResponseCallback
-      implements ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, String data) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(data);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedLaunchContentResponseCallback
-      implements ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(String data, int contentLaunchStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(data);
-      responseValues.add(contentLaunchStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedLaunchURLResponseCallback
-      implements ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(String data, int contentLaunchStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(data);
-      responseValues.add(contentLaunchStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-=======
->>>>>>> 698449e64 (add recycler view to display endpoint)
-  public class DelegatedClearAllPinsResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearAllRfidsResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearHolidayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearPinResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearPinResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearRfidResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearRfidResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearWeekdayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedClearYeardayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetHolidayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        int scheduleId,
-        int status,
-        long localStartTime,
-        long localEndTime,
-        int operatingModeDuringHoliday) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(scheduleId);
-      responseValues.add(status);
-      responseValues.add(localStartTime);
-      responseValues.add(localEndTime);
-      responseValues.add(operatingModeDuringHoliday);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetLogRecordResponseCallback
-      implements ChipClusters.DoorLockCluster.GetLogRecordResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        int logEntryId,
-        long timestamp,
-        int eventType,
-        int source,
-        int eventIdOrAlarmCode,
-        int userId,
-        byte[] pin) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(logEntryId);
-      responseValues.add(timestamp);
-      responseValues.add(eventType);
-      responseValues.add(source);
-      responseValues.add(eventIdOrAlarmCode);
-      responseValues.add(userId);
-      responseValues.add(pin);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetPinResponseCallback
-      implements ChipClusters.DoorLockCluster.GetPinResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int userId, int userStatus, int userType, byte[] pin) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(userId);
-      responseValues.add(userStatus);
-      responseValues.add(userType);
-      responseValues.add(pin);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetRfidResponseCallback
-      implements ChipClusters.DoorLockCluster.GetRfidResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int userId, int userStatus, int userType, byte[] rfid) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(userId);
-      responseValues.add(userStatus);
-      responseValues.add(userType);
-      responseValues.add(rfid);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetUserTypeResponseCallback
-      implements ChipClusters.DoorLockCluster.GetUserTypeResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int userId, int userType) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(userId);
-      responseValues.add(userType);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetWeekdayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        int scheduleId,
-        int userId,
-        int status,
-        int daysMask,
-        int startHour,
-        int startMinute,
-        int endHour,
-        int endMinute) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(scheduleId);
-      responseValues.add(userId);
-      responseValues.add(status);
-      responseValues.add(daysMask);
-      responseValues.add(startHour);
-      responseValues.add(startMinute);
-      responseValues.add(endHour);
-      responseValues.add(endMinute);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetYeardayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        int scheduleId, int userId, int status, long localStartTime, long localEndTime) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(scheduleId);
-      responseValues.add(userId);
-      responseValues.add(status);
-      responseValues.add(localStartTime);
-      responseValues.add(localEndTime);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedLockDoorResponseCallback
-      implements ChipClusters.DoorLockCluster.LockDoorResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetHolidayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetPinResponseCallback
-      implements ChipClusters.DoorLockCluster.SetPinResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetRfidResponseCallback
-      implements ChipClusters.DoorLockCluster.SetRfidResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetUserTypeResponseCallback
-      implements ChipClusters.DoorLockCluster.SetUserTypeResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetWeekdayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetYeardayScheduleResponseCallback
-      implements ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedUnlockDoorResponseCallback
-      implements ChipClusters.DoorLockCluster.UnlockDoorResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedUnlockWithTimeoutResponseCallback
-      implements ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedArmFailSafeResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedCommissioningCompleteResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSetRegulatoryConfigResponseCallback
-      implements ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedAddGroupResponseCallback
-      implements ChipClusters.GroupsCluster.AddGroupResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetGroupMembershipResponseCallback
-      implements ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int capacity, int groupCount
-        // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        ) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(capacity);
-      responseValues.add(groupCount);
-      // groupList: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedRemoveGroupResponseCallback
-      implements ChipClusters.GroupsCluster.RemoveGroupResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedViewGroupResponseCallback
-      implements ChipClusters.GroupsCluster.ViewGroupResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId, String groupName) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      responseValues.add(groupName);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedIdentifyQueryResponseCallback
-      implements ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int timeout) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(timeout);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedSendKeyResponseCallback
-      implements ChipClusters.KeypadInputCluster.SendKeyResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaFastForwardResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaNextResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaPauseResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaPlayResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaPreviousResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaRewindResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaSeekResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaSkipBackwardResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaSkipForwardResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaStartOverResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedMediaStopResponseCallback
-      implements ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int mediaPlaybackStatus) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(mediaPlaybackStatus);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedAddThreadNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedAddWiFiNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedDisableNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedEnableNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedRemoveNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedScanNetworksResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText
-        // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        ) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      // wifiScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      // threadScanResults: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedUpdateThreadNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedUpdateWiFiNetworkResponseCallback
-      implements ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int errorCode, String debugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(errorCode);
-      responseValues.add(debugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedApplyUpdateRequestResponseCallback
-      implements ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int action, long delayedActionTime) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(action);
-      responseValues.add(delayedActionTime);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedQueryImageResponseCallback
-      implements ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        int status,
-        long delayedActionTime,
-        String imageURI,
-        long softwareVersion,
-        String softwareVersionString,
-        byte[] updateToken,
-        boolean userConsentNeeded,
-        byte[] metadataForRequestor) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(delayedActionTime);
-      responseValues.add(imageURI);
-      responseValues.add(softwareVersion);
-      responseValues.add(softwareVersionString);
-      responseValues.add(updateToken);
-      responseValues.add(userConsentNeeded);
-      responseValues.add(metadataForRequestor);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedAttestationResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(byte[] AttestationElements, byte[] Signature) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(AttestationElements);
-      responseValues.add(Signature);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedCertificateChainResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(byte[] Certificate) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(Certificate);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedNOCResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.NOCResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int StatusCode, int FabricIndex, String DebugText) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(StatusCode);
-      responseValues.add(FabricIndex);
-      responseValues.add(DebugText);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedOpCSRResponseCallback
-      implements ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(byte[] NOCSRElements, byte[] AttestationSignature) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(NOCSRElements);
-      responseValues.add(AttestationSignature);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedAddSceneResponseCallback
-      implements ChipClusters.ScenesCluster.AddSceneResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId, int sceneId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      responseValues.add(sceneId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedGetSceneMembershipResponseCallback
-      implements ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int capacity, int groupId, int sceneCount
-        // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        ) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(capacity);
-      responseValues.add(groupId);
-      responseValues.add(sceneCount);
-      // sceneList: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedRemoveAllScenesResponseCallback
-      implements ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedRemoveSceneResponseCallback
-      implements ChipClusters.ScenesCluster.RemoveSceneResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId, int sceneId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      responseValues.add(sceneId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedStoreSceneResponseCallback
-      implements ChipClusters.ScenesCluster.StoreSceneResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId, int sceneId) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      responseValues.add(sceneId);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedViewSceneResponseCallback
-      implements ChipClusters.ScenesCluster.ViewSceneResponseCallback, DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, int groupId, int sceneId, int transitionTime, String sceneName
-        // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        ) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(groupId);
-      responseValues.add(sceneId);
-      responseValues.add(transitionTime);
-      responseValues.add(sceneName);
-      // extensionFieldSets: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedChangeChannelResponseCallback
-      implements ChipClusters.TvChannelCluster.ChangeChannelResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        int ErrorType) {
-      List<Object> responseValues = new ArrayList<>();
-      // ChannelMatch: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      responseValues.add(ErrorType);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedNavigateTargetResponseCallback
-      implements ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int status, String data) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(status);
-      responseValues.add(data);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedTestAddArgumentsResponseCallback
-      implements ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int returnValue) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(returnValue);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedTestListInt8UReverseResponseCallback
-      implements ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(
-        // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
-        // Conversion from this type to Java is not properly implemented yet
-        ) {
-      List<Object> responseValues = new ArrayList<>();
-      // arg1: /* TYPE WARNING: array array defaults to */ uint8_t *
-      // Conversion from this type to Java is not properly implemented yet
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public class DelegatedTestSpecificResponseCallback
-      implements ChipClusters.TestClusterCluster.TestSpecificResponseCallback,
-          DelegatedClusterCallback {
-    private ClusterCommandCallback callback;
-
-    @Override
-    public void setCallbackDelegate(ClusterCommandCallback callback) {
-      this.callback = callback;
-    }
-
-    @Override
-    public void onSuccess(int returnValue) {
-      List<Object> responseValues = new ArrayList<>();
-      responseValues.add(returnValue);
-      callback.onSuccess(responseValues);
-    }
-
-    @Override
-    public void onError(Exception error) {
-      callback.onFailure(error);
-    }
-  }
-
-  public Map<String, ClusterInfo> getClusterMap() {
-    Map<String, ClusterInfo> clusterMap = new HashMap<>();
-    Map<String, CommandInfo> accountLoginClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo accountLogingetSetupPINCommandParameterInfo =
-        new CommandParameterInfo(
-            "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter accountLogingetSetupPINtempAccountIdentifierCommandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-<<<<<<< HEAD
-    accountLogin_getSetupPIN_commandParams.put(
-        "tempAccountIdentifier", accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    accountLogingetSetupPINCommandParams.put(
-        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
-    accountLogingetSetupPINCommandParams.put(
-        "tempAccountIdentifier", accountLogingetSetupPINtempAccountIdentifierCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo accountLogingetSetupPINCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AccountLoginCluster) cluster)
-                  .getSetupPIN(
-                      (ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback,
-                      (String) commandArguments.get("tempAccountIdentifier"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            accountLogin_getSetupPIN_commandParams);
-    accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> accountLogin_login_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter login_tempAccountIdentifier_commandParameter =
-        new CommandParameter("tempAccountIdentifier", String.class);
-    accountLogin_login_commandParams.add(login_tempAccountIdentifier_commandParameter);
-
-    CommandParameter login_setupPIN_commandParameter =
-        new CommandParameter("setupPIN", String.class);
-    accountLogin_login_commandParams.add(login_setupPIN_commandParameter);
-=======
-    Map<String, CommandParameter> accountLogin_login_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetSetupPINResponseCallback(),
-            accountLogingetSetupPINCommandParams);
-<<<<<<< HEAD
-    accountLoginClusterCommandInfo.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
-    Map<String, CommandParameter> accountLoginloginCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    accountLoginClusterCommandInfoMap.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
-    Map<String, CommandParameterInfo> accountLoginloginCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo accountLoginloginCommandParameterInfo =
-        new CommandParameterInfo("AccountLogin", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
-        new CommandParameterInfo("tempAccountIdentifier", String.class);
-    accountLoginloginCommandParams.put(
-        "tempAccountIdentifier", accountLoginlogintempAccountIdentifierCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter accountLoginloginsetupPINCommandParameter =
-        new CommandParameter("setupPIN", String.class);
-<<<<<<< HEAD
-    accountLogin_login_commandParams.put("setupPIN", accountLogin_login_setupPIN_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo accountLoginloginsetupPINCommandParameterInfo =
-        new CommandParameterInfo("setupPIN", String.class);
-    accountLoginloginCommandParams.put("setupPIN", accountLoginloginsetupPINCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo accountLoginloginCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AccountLoginCluster) cluster)
-                  .login(
-                      (DefaultClusterCallback) callback,
-                      (String) commandArguments.get("tempAccountIdentifier"),
-                      (String) commandArguments.get("setupPIN"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            accountLoginloginCommandParams);
-    accountLoginClusterCommandInfoMap.put("login", accountLoginloginCommandInfo);
-    // Populate cluster
-    ClusterInfo accountLoginClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            accountLogin_ClusterCommandInfo);
-    clusterMap.put("accountLogin", accountLogin_clusterInfo);
-    Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter openBasicCommissioningWindow_commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openBasicCommissioningWindow_commandParams.add(
-        openBasicCommissioningWindow_commissioningTimeout_commandParameter);
-=======
-=======
-            accountLoginClusterCommandInfo);
-    clusterMap.put("accountLogin", accountLoginClusterInfo);
-    Map<String, CommandInfo> administratorCommissioningClusterCommandInfo = new LinkedHashMap<>();
->>>>>>> 41b0956c1 (on/off commands working)
-    Map<String, CommandParameter>
-=======
-            accountLoginClusterCommandInfoMap);
-    clusterMap.put("accountLogin", accountLoginClusterInfo);
-    Map<String, CommandInfo> administratorCommissioningClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo>
->>>>>>> fde1d13c0 (fix comments)
-        administratorCommissioningopenBasicCommissioningWindowCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo
-        administratorCommissioningopenBasicCommissioningWindowCommandParameterInfo =
-            new CommandParameterInfo(
-                "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", int.class);
-    administratorCommissioningopenBasicCommissioningWindowCommandParams.put(
-        "commissioningTimeout",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        administratorCommissioningopenBasicCommissioningWindowcommissioningTimeoutCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo administratorCommissioningopenBasicCommissioningWindowCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .openBasicCommissioningWindow(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("commissioningTimeout"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioningopenBasicCommissioningWindowCommandParams);
-    administratorCommissioningClusterCommandInfoMap.put(
-        "openBasicCommissioningWindow",
-<<<<<<< HEAD
-        administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter openCommissioningWindow_commissioningTimeout_commandParameter =
-        new CommandParameter("commissioningTimeout", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_commissioningTimeout_commandParameter);
-
-    CommandParameter openCommissioningWindow_PAKEVerifier_commandParameter =
-        new CommandParameter("PAKEVerifier", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_PAKEVerifier_commandParameter);
-
-    CommandParameter openCommissioningWindow_discriminator_commandParameter =
-        new CommandParameter("discriminator", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_discriminator_commandParameter);
-
-    CommandParameter openCommissioningWindow_iterations_commandParameter =
-        new CommandParameter("iterations", long.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_iterations_commandParameter);
-
-    CommandParameter openCommissioningWindow_salt_commandParameter =
-        new CommandParameter("salt", byte[].class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_salt_commandParameter);
-
-    CommandParameter openCommissioningWindow_passcodeID_commandParameter =
-        new CommandParameter("passcodeID", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.add(
-        openCommissioningWindow_passcodeID_commandParameter);
-=======
-    Map<String, CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-        administratorCommissioningopenBasicCommissioningWindowCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> administratorCommissioningopenCommissioningWindowCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo>
-        administratorCommissioningopenCommissioningWindowCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo administratorCommissioningopenCommissioningWindowCommandParameterInfo =
-        new CommandParameterInfo(
-            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo =
-            new CommandParameterInfo("commissioningTimeout", int.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "commissioningTimeout",
-        administratorCommissioningopenCommissioningWindowcommissioningTimeoutCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo =
-            new CommandParameterInfo("PAKEVerifier", byte[].class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "PAKEVerifier",
-        administratorCommissioningopenCommissioningWindowPAKEVerifierCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo =
-            new CommandParameterInfo("discriminator", int.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "discriminator",
-        administratorCommissioningopenCommissioningWindowdiscriminatorCommandParameterInfo);
-
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo =
-            new CommandParameterInfo("iterations", long.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "iterations",
-        administratorCommissioningopenCommissioningWindowiterationsCommandParameterInfo);
-
-    CommandParameterInfo administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo =
-        new CommandParameterInfo("salt", byte[].class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "salt", administratorCommissioningopenCommissioningWindowsaltCommandParameterInfo);
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-    CommandParameter
-        administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter =
-            new CommandParameter("passcodeID", int.class);
-    administratorCommissioning_openCommissioningWindow_commandParams.put(
-        "passcodeID",
-        administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    CommandParameter administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameter =
-        new CommandParameter("passcodeID", int.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "passcodeID", administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo
-        administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameterInfo =
-            new CommandParameterInfo("passcodeID", int.class);
-    administratorCommissioningopenCommissioningWindowCommandParams.put(
-        "passcodeID",
-        administratorCommissioningopenCommissioningWindowpasscodeIDCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo administratorCommissioningopenCommissioningWindowCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .openCommissioningWindow(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("commissioningTimeout"),
-                      (byte[]) commandArguments.get("PAKEVerifier"),
-                      (Integer) commandArguments.get("discriminator"),
-                      (Long) commandArguments.get("iterations"),
-                      (byte[]) commandArguments.get("salt"),
-                      (Integer) commandArguments.get("passcodeID"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            administratorCommissioning_openCommissioningWindow_commandParams);
-    administratorCommissioning_ClusterCommandInfo.put(
-        "openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> administratorCommissioning_revokeCommissioning_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            administratorCommissioningopenCommissioningWindowCommandParams);
-    administratorCommissioningClusterCommandInfoMap.put(
-        "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> administratorCommissioningrevokeCommissioningCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo administratorCommissioningrevokeCommissioningCommandParameterInfo =
-        new CommandParameterInfo(
-            "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo administratorCommissioningrevokeCommissioningCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                  .revokeCommissioning((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            administratorCommissioningrevokeCommissioningCommandParams);
-    administratorCommissioningClusterCommandInfoMap.put(
-        "revokeCommissioning", administratorCommissioningrevokeCommissioningCommandInfo);
-    // Populate cluster
-    ClusterInfo administratorCommissioningClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            administratorCommissioning_ClusterCommandInfo);
-    clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
-    Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> applicationBasic_changeStatus_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter changeStatus_status_commandParameter =
-        new CommandParameter("status", int.class);
-    applicationBasic_changeStatus_commandParams.add(changeStatus_status_commandParameter);
-=======
-    Map<String, CommandParameter> applicationBasic_changeStatus_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            administratorCommissioningClusterCommandInfo);
-    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
-    Map<String, CommandInfo> applicationBasicClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> applicationBasicchangeStatusCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter applicationBasicchangeStatusCommandParameter =
-        new CommandParameter("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter applicationBasicchangeStatusstatusCommandParameter =
-        new CommandParameter("status", int.class);
-<<<<<<< HEAD
-    applicationBasic_changeStatus_commandParams.put(
-        "status", applicationBasic_changeStatus_status_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    applicationBasicchangeStatusCommandParams.put(
-        "status", applicationBasicchangeStatusstatusCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            administratorCommissioningClusterCommandInfoMap);
-    clusterMap.put("administratorCommissioning", administratorCommissioningClusterInfo);
-    Map<String, CommandInfo> applicationBasicClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> applicationBasicchangeStatusCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo applicationBasicchangeStatusCommandParameterInfo =
-        new CommandParameterInfo("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo =
-        new CommandParameterInfo("status", int.class);
-    applicationBasicchangeStatusCommandParams.put(
-        "status", applicationBasicchangeStatusstatusCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo applicationBasicchangeStatusCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ApplicationBasicCluster) cluster)
-                  .changeStatus(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("status"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            applicationBasicchangeStatusCommandParams);
-    applicationBasicClusterCommandInfoMap.put(
-        "changeStatus", applicationBasicchangeStatusCommandInfo);
-    // Populate cluster
-    ClusterInfo applicationBasicClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            applicationBasic_ClusterCommandInfo);
-    clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
-    Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> applicationLauncher_launchApp_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter launchApp_data_commandParameter = new CommandParameter("data", String.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_data_commandParameter);
-
-    CommandParameter launchApp_catalogVendorId_commandParameter =
-        new CommandParameter("catalogVendorId", int.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_catalogVendorId_commandParameter);
-
-    CommandParameter launchApp_applicationId_commandParameter =
-        new CommandParameter("applicationId", String.class);
-    applicationLauncher_launchApp_commandParams.add(launchApp_applicationId_commandParameter);
-=======
-    Map<String, CommandParameter> applicationLauncher_launchApp_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            applicationBasicClusterCommandInfo);
-    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
-    Map<String, CommandInfo> applicationLauncherClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> applicationLauncherlaunchAppCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            applicationBasicClusterCommandInfoMap);
-    clusterMap.put("applicationBasic", applicationBasicClusterInfo);
-    Map<String, CommandInfo> applicationLauncherClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo applicationLauncherlaunchAppCommandParameterInfo =
-        new CommandParameterInfo(
-            "ApplicationLauncher",
-            ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
-    CommandParameterInfo applicationLauncherlaunchAppdataCommandParameterInfo =
-        new CommandParameterInfo("data", String.class);
-    applicationLauncherlaunchAppCommandParams.put(
-        "data", applicationLauncherlaunchAppdataCommandParameterInfo);
-
-    CommandParameterInfo applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo =
-        new CommandParameterInfo("catalogVendorId", int.class);
-    applicationLauncherlaunchAppCommandParams.put(
-        "catalogVendorId", applicationLauncherlaunchAppcatalogVendorIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter applicationLauncherlaunchAppapplicationIdCommandParameter =
-        new CommandParameter("applicationId", String.class);
-<<<<<<< HEAD
-    applicationLauncher_launchApp_commandParams.put(
-        "applicationId", applicationLauncher_launchApp_applicationId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    applicationLauncherlaunchAppCommandParams.put(
-        "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo applicationLauncherlaunchAppapplicationIdCommandParameterInfo =
-        new CommandParameterInfo("applicationId", String.class);
-    applicationLauncherlaunchAppCommandParams.put(
-        "applicationId", applicationLauncherlaunchAppapplicationIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo applicationLauncherlaunchAppCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ApplicationLauncherCluster) cluster)
-                  .launchApp(
-                      (ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback) callback,
-                      (String) commandArguments.get("data"),
-                      (Integer) commandArguments.get("catalogVendorId"),
-                      (String) commandArguments.get("applicationId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedLaunchAppResponseCallback(),
-            applicationLauncherlaunchAppCommandParams);
-    applicationLauncherClusterCommandInfoMap.put(
-        "launchApp", applicationLauncherlaunchAppCommandInfo);
-    // Populate cluster
-    ClusterInfo applicationLauncherClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            applicationLauncher_ClusterCommandInfo);
-    clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
-    Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> audioOutput_renameOutput_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter renameOutput_index_commandParameter = new CommandParameter("index", int.class);
-    audioOutput_renameOutput_commandParams.add(renameOutput_index_commandParameter);
-
-    CommandParameter renameOutput_name_commandParameter =
-        new CommandParameter("name", String.class);
-    audioOutput_renameOutput_commandParams.add(renameOutput_name_commandParameter);
-=======
-    Map<String, CommandParameter> audioOutput_renameOutput_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            applicationLauncherClusterCommandInfo);
-    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
-    Map<String, CommandInfo> audioOutputClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> audioOutputrenameOutputCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            applicationLauncherClusterCommandInfoMap);
-    clusterMap.put("applicationLauncher", applicationLauncherClusterInfo);
-    Map<String, CommandInfo> audioOutputClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo audioOutputrenameOutputCommandParameterInfo =
-        new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", int.class);
-    audioOutputrenameOutputCommandParams.put(
-        "index", audioOutputrenameOutputindexCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter audioOutputrenameOutputnameCommandParameter =
-        new CommandParameter("name", String.class);
-<<<<<<< HEAD
-    audioOutput_renameOutput_commandParams.put(
-        "name", audioOutput_renameOutput_name_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    audioOutputrenameOutputCommandParams.put("name", audioOutputrenameOutputnameCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo audioOutputrenameOutputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
-    audioOutputrenameOutputCommandParams.put(
-        "name", audioOutputrenameOutputnameCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo audioOutputrenameOutputCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .renameOutput(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("index"),
-                      (String) commandArguments.get("name"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            audioOutput_renameOutput_commandParams);
-    audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> audioOutput_selectOutput_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter selectOutput_index_commandParameter = new CommandParameter("index", int.class);
-    audioOutput_selectOutput_commandParams.add(selectOutput_index_commandParameter);
-=======
-    Map<String, CommandParameter> audioOutput_selectOutput_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            audioOutputrenameOutputCommandParams);
-<<<<<<< HEAD
-    audioOutputClusterCommandInfo.put("renameOutput", audioOutputrenameOutputCommandInfo);
-    Map<String, CommandParameter> audioOutputselectOutputCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter audioOutputselectOutputCommandParameter =
-        new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter audioOutputselectOutputindexCommandParameter =
-        new CommandParameter("index", int.class);
-<<<<<<< HEAD
-    audioOutput_selectOutput_commandParams.put(
-        "index", audioOutput_selectOutput_index_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    audioOutputselectOutputCommandParams.put("index", audioOutputselectOutputindexCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    audioOutputClusterCommandInfoMap.put("renameOutput", audioOutputrenameOutputCommandInfo);
-    Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo audioOutputselectOutputCommandParameterInfo =
-        new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
-        new CommandParameterInfo("index", int.class);
-    audioOutputselectOutputCommandParams.put(
-        "index", audioOutputselectOutputindexCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo audioOutputselectOutputCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.AudioOutputCluster) cluster)
-                  .selectOutput(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            audioOutputselectOutputCommandParams);
-    audioOutputClusterCommandInfoMap.put("selectOutput", audioOutputselectOutputCommandInfo);
-    // Populate cluster
-    ClusterInfo audioOutputClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            audioOutput_ClusterCommandInfo);
-    clusterMap.put("audioOutput", audioOutput_clusterInfo);
-    Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter barrierControlGoToPercent_percentOpen_commandParameter =
-        new CommandParameter("percentOpen", int.class);
-    barrierControl_barrierControlGoToPercent_commandParams.add(
-        barrierControlGoToPercent_percentOpen_commandParameter);
-=======
-    Map<String, CommandParameter> barrierControl_barrierControlGoToPercent_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            audioOutputClusterCommandInfo);
-    clusterMap.put("audioOutput", audioOutputClusterInfo);
-    Map<String, CommandInfo> barrierControlClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> barrierControlbarrierControlGoToPercentCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter barrierControlbarrierControlGoToPercentCommandParameter =
-        new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter barrierControlbarrierControlGoToPercentpercentOpenCommandParameter =
-        new CommandParameter("percentOpen", int.class);
-<<<<<<< HEAD
-    barrierControl_barrierControlGoToPercent_commandParams.put(
-        "percentOpen", barrierControl_barrierControlGoToPercent_percentOpen_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    barrierControlbarrierControlGoToPercentCommandParams.put(
-        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            audioOutputClusterCommandInfoMap);
-    clusterMap.put("audioOutput", audioOutputClusterInfo);
-    Map<String, CommandInfo> barrierControlClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo barrierControlbarrierControlGoToPercentCommandParameterInfo =
-        new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
-        new CommandParameterInfo("percentOpen", int.class);
-    barrierControlbarrierControlGoToPercentCommandParams.put(
-        "percentOpen", barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo barrierControlbarrierControlGoToPercentCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .barrierControlGoToPercent(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("percentOpen"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            barrierControl_barrierControlGoToPercent_commandParams);
-    barrierControl_ClusterCommandInfo.put(
-        "barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> barrierControl_barrierControlStop_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> barrierControl_barrierControlStop_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            barrierControlbarrierControlGoToPercentCommandParams);
-    barrierControlClusterCommandInfoMap.put(
-        "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> barrierControlbarrierControlStopCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter barrierControlbarrierControlStopCommandParameter =
-        new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo barrierControlbarrierControlStopCommandParameterInfo =
-        new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo barrierControlbarrierControlStopCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.BarrierControlCluster) cluster)
-                  .barrierControlStop((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            barrierControlbarrierControlStopCommandParams);
-    barrierControlClusterCommandInfoMap.put(
-        "barrierControlStop", barrierControlbarrierControlStopCommandInfo);
-    // Populate cluster
-    ClusterInfo barrierControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            barrierControl_ClusterCommandInfo);
-    clusterMap.put("barrierControl", barrierControl_clusterInfo);
-    Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> basic_mfgSpecificPing_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> basic_mfgSpecificPing_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            barrierControlClusterCommandInfo);
-    clusterMap.put("barrierControl", barrierControlClusterInfo);
-    Map<String, CommandInfo> basicClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> basicmfgSpecificPingCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter basicmfgSpecificPingCommandParameter =
-        new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            barrierControlClusterCommandInfoMap);
-    clusterMap.put("barrierControl", barrierControlClusterInfo);
-    Map<String, CommandInfo> basicClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> basicmfgSpecificPingCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo basicmfgSpecificPingCommandParameterInfo =
-        new CommandParameterInfo("Basic", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo basicmfgSpecificPingCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.BasicCluster) cluster)
-                  .mfgSpecificPing((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            basicmfgSpecificPingCommandParams);
-    basicClusterCommandInfoMap.put("mfgSpecificPing", basicmfgSpecificPingCommandInfo);
-    // Populate cluster
-    ClusterInfo basicClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId),
-            basicClusterCommandInfoMap);
-    clusterMap.put("basic", basicClusterInfo);
-    Map<String, CommandInfo> binaryInputBasicClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo binaryInputBasicClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            binaryInputBasic_ClusterCommandInfo);
-    clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
-    Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> binding_bind_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter bind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    binding_bind_commandParams.add(bind_nodeId_commandParameter);
-
-    CommandParameter bind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    binding_bind_commandParams.add(bind_groupId_commandParameter);
-
-    CommandParameter bind_endpointId_commandParameter =
-        new CommandParameter("endpointId", int.class);
-    binding_bind_commandParams.add(bind_endpointId_commandParameter);
-
-    CommandParameter bind_clusterId_commandParameter =
-        new CommandParameter("clusterId", long.class);
-    binding_bind_commandParams.add(bind_clusterId_commandParameter);
-=======
-    Map<String, CommandParameter> binding_bind_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            binaryInputBasicClusterCommandInfo);
-    clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
-    Map<String, CommandInfo> bindingClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> bindingbindCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            binaryInputBasicClusterCommandInfoMap);
-    clusterMap.put("binaryInputBasic", binaryInputBasicClusterInfo);
-    Map<String, CommandInfo> bindingClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> bindingbindCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo bindingbindCommandParameterInfo =
-        new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bindingbindnodeIdCommandParameterInfo =
-        new CommandParameterInfo("nodeId", long.class);
-    bindingbindCommandParams.put("nodeId", bindingbindnodeIdCommandParameterInfo);
-
-    CommandParameterInfo bindingbindgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    bindingbindCommandParams.put("groupId", bindingbindgroupIdCommandParameterInfo);
-
-    CommandParameterInfo bindingbindendpointIdCommandParameterInfo =
-        new CommandParameterInfo("endpointId", int.class);
-    bindingbindCommandParams.put("endpointId", bindingbindendpointIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter bindingbindclusterIdCommandParameter =
-        new CommandParameter("clusterId", long.class);
-<<<<<<< HEAD
-    binding_bind_commandParams.put("clusterId", binding_bind_clusterId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    bindingbindCommandParams.put("clusterId", bindingbindclusterIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo bindingbindclusterIdCommandParameterInfo =
-        new CommandParameterInfo("clusterId", long.class);
-    bindingbindCommandParams.put("clusterId", bindingbindclusterIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo bindingbindCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.BindingCluster) cluster)
-                  .bind(
-                      (DefaultClusterCallback) callback,
-                      (Long) commandArguments.get("nodeId"),
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("endpointId"),
-                      (Long) commandArguments.get("clusterId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            binding_bind_commandParams);
-    binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> binding_unbind_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter unbind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-    binding_unbind_commandParams.add(unbind_nodeId_commandParameter);
-
-    CommandParameter unbind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    binding_unbind_commandParams.add(unbind_groupId_commandParameter);
-
-    CommandParameter unbind_endpointId_commandParameter =
-        new CommandParameter("endpointId", int.class);
-    binding_unbind_commandParams.add(unbind_endpointId_commandParameter);
-
-    CommandParameter unbind_clusterId_commandParameter =
-        new CommandParameter("clusterId", long.class);
-    binding_unbind_commandParams.add(unbind_clusterId_commandParameter);
-=======
-    Map<String, CommandParameter> binding_unbind_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            bindingbindCommandParams);
-<<<<<<< HEAD
-    bindingClusterCommandInfo.put("bind", bindingbindCommandInfo);
-    Map<String, CommandParameter> bindingunbindCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    bindingClusterCommandInfoMap.put("bind", bindingbindCommandInfo);
-    Map<String, CommandParameterInfo> bindingunbindCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo bindingunbindCommandParameterInfo =
-        new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bindingunbindnodeIdCommandParameterInfo =
-        new CommandParameterInfo("nodeId", long.class);
-    bindingunbindCommandParams.put("nodeId", bindingunbindnodeIdCommandParameterInfo);
-
-    CommandParameterInfo bindingunbindgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    bindingunbindCommandParams.put("groupId", bindingunbindgroupIdCommandParameterInfo);
-
-    CommandParameterInfo bindingunbindendpointIdCommandParameterInfo =
-        new CommandParameterInfo("endpointId", int.class);
-    bindingunbindCommandParams.put("endpointId", bindingunbindendpointIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter bindingunbindclusterIdCommandParameter =
-        new CommandParameter("clusterId", long.class);
-<<<<<<< HEAD
-    binding_unbind_commandParams.put("clusterId", binding_unbind_clusterId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    bindingunbindCommandParams.put("clusterId", bindingunbindclusterIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo bindingunbindclusterIdCommandParameterInfo =
-        new CommandParameterInfo("clusterId", long.class);
-    bindingunbindCommandParams.put("clusterId", bindingunbindclusterIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo bindingunbindCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.BindingCluster) cluster)
-                  .unbind(
-                      (DefaultClusterCallback) callback,
-                      (Long) commandArguments.get("nodeId"),
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("endpointId"),
-                      (Long) commandArguments.get("clusterId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bindingunbindCommandParams);
-    bindingClusterCommandInfoMap.put("unbind", bindingunbindCommandInfo);
-    // Populate cluster
-    ClusterInfo bindingClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId),
-            bindingClusterCommandInfoMap);
-    clusterMap.put("binding", bindingClusterInfo);
-    Map<String, CommandInfo> booleanStateClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo booleanStateClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BooleanStateCluster(ptr, endpointId),
-            booleanStateClusterCommandInfoMap);
-    clusterMap.put("booleanState", booleanStateClusterInfo);
-    Map<String, CommandInfo> bridgedActionsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsdisableActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsdisableActionCommandParams.put(
-        "actionID", bridgedActionsdisableActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsdisableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsdisableActionCommandParams.put(
-        "invokeID", bridgedActionsdisableActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsdisableActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .disableAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsdisableActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "disableAction", bridgedActionsdisableActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsdisableActionWithDurationCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsdisableActionWithDurationinvokeIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsdisableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", long.class);
-    bridgedActionsdisableActionWithDurationCommandParams.put(
-        "duration", bridgedActionsdisableActionWithDurationdurationCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsdisableActionWithDurationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .disableActionWithDuration(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsdisableActionWithDurationCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "disableActionWithDuration", bridgedActionsdisableActionWithDurationCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsenableActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsenableActionCommandParams.put(
-        "actionID", bridgedActionsenableActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsenableActionCommandParams.put(
-        "invokeID", bridgedActionsenableActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsenableActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .enableAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsenableActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put("enableAction", bridgedActionsenableActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsenableActionWithDurationCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsenableActionWithDurationactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsenableActionWithDurationinvokeIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsenableActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", long.class);
-    bridgedActionsenableActionWithDurationCommandParams.put(
-        "duration", bridgedActionsenableActionWithDurationdurationCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsenableActionWithDurationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .enableActionWithDuration(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsenableActionWithDurationCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "enableActionWithDuration", bridgedActionsenableActionWithDurationCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsinstantActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsinstantActionCommandParams.put(
-        "actionID", bridgedActionsinstantActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsinstantActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsinstantActionCommandParams.put(
-        "invokeID", bridgedActionsinstantActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsinstantActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .instantAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsinstantActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "instantAction", bridgedActionsinstantActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsinstantActionWithTransitionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "actionID", bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "invokeID", bridgedActionsinstantActionWithTransitioninvokeIDCommandParameterInfo);
-
-    CommandParameterInfo
-        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", int.class);
-    bridgedActionsinstantActionWithTransitionCommandParams.put(
-        "transitionTime",
-        bridgedActionsinstantActionWithTransitiontransitionTimeCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsinstantActionWithTransitionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .instantActionWithTransition(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"),
-                      (Integer) commandArguments.get("transitionTime"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsinstantActionWithTransitionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "instantActionWithTransition", bridgedActionsinstantActionWithTransitionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionspauseActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionspauseActionCommandParams.put(
-        "actionID", bridgedActionspauseActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionspauseActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionspauseActionCommandParams.put(
-        "invokeID", bridgedActionspauseActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionspauseActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .pauseAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionspauseActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put("pauseAction", bridgedActionspauseActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionspauseActionWithDurationCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "actionID", bridgedActionspauseActionWithDurationactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionspauseActionWithDurationinvokeIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionspauseActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", long.class);
-    bridgedActionspauseActionWithDurationCommandParams.put(
-        "duration", bridgedActionspauseActionWithDurationdurationCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionspauseActionWithDurationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .pauseActionWithDuration(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionspauseActionWithDurationCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "pauseActionWithDuration", bridgedActionspauseActionWithDurationCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsresumeActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsresumeActionCommandParams.put(
-        "actionID", bridgedActionsresumeActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsresumeActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsresumeActionCommandParams.put(
-        "invokeID", bridgedActionsresumeActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsresumeActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .resumeAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsresumeActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put("resumeAction", bridgedActionsresumeActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsstartActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsstartActionCommandParams.put(
-        "actionID", bridgedActionsstartActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsstartActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsstartActionCommandParams.put(
-        "invokeID", bridgedActionsstartActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsstartActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .startAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstartActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put("startAction", bridgedActionsstartActionCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsstartActionWithDurationCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "actionID", bridgedActionsstartActionWithDurationactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "invokeID", bridgedActionsstartActionWithDurationinvokeIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsstartActionWithDurationdurationCommandParameterInfo =
-        new CommandParameterInfo("duration", long.class);
-    bridgedActionsstartActionWithDurationCommandParams.put(
-        "duration", bridgedActionsstartActionWithDurationdurationCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsstartActionWithDurationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .startActionWithDuration(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"),
-                      (Long) commandArguments.get("duration"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstartActionWithDurationCommandParams);
-    bridgedActionsClusterCommandInfoMap.put(
-        "startActionWithDuration", bridgedActionsstartActionWithDurationCommandInfo);
-    Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo bridgedActionsstopActionCommandParameterInfo =
-        new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
-        new CommandParameterInfo("actionID", int.class);
-    bridgedActionsstopActionCommandParams.put(
-        "actionID", bridgedActionsstopActionactionIDCommandParameterInfo);
-
-    CommandParameterInfo bridgedActionsstopActioninvokeIDCommandParameterInfo =
-        new CommandParameterInfo("invokeID", long.class);
-    bridgedActionsstopActionCommandParams.put(
-        "invokeID", bridgedActionsstopActioninvokeIDCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo bridgedActionsstopActionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.BridgedActionsCluster) cluster)
-                  .stopAction(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("actionID"),
-                      (Long) commandArguments.get("invokeID"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            bridgedActionsstopActionCommandParams);
-    bridgedActionsClusterCommandInfoMap.put("stopAction", bridgedActionsstopActionCommandInfo);
-    // Populate cluster
-    ClusterInfo bridgedActionsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BridgedActionsCluster(ptr, endpointId),
-            bridgedActionsClusterCommandInfoMap);
-    clusterMap.put("bridgedActions", bridgedActionsClusterInfo);
-    Map<String, CommandInfo> bridgedDeviceBasicClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo bridgedDeviceBasicClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            bridgedDeviceBasic_ClusterCommandInfo);
-    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
-    Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_colorLoopSet_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter colorLoopSet_updateFlags_commandParameter =
-        new CommandParameter("updateFlags", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_updateFlags_commandParameter);
-
-    CommandParameter colorLoopSet_action_commandParameter =
-        new CommandParameter("action", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_action_commandParameter);
-
-    CommandParameter colorLoopSet_direction_commandParameter =
-        new CommandParameter("direction", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_direction_commandParameter);
-
-    CommandParameter colorLoopSet_time_commandParameter = new CommandParameter("time", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_time_commandParameter);
-
-    CommandParameter colorLoopSet_startHue_commandParameter =
-        new CommandParameter("startHue", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_startHue_commandParameter);
-
-    CommandParameter colorLoopSet_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_optionsMask_commandParameter);
-
-    CommandParameter colorLoopSet_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_colorLoopSet_commandParams.add(colorLoopSet_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_colorLoopSet_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            bridgedDeviceBasicClusterCommandInfo);
-    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
-    Map<String, CommandInfo> colorControlClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> colorControlcolorLoopSetCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            bridgedDeviceBasicClusterCommandInfoMap);
-    clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasicClusterInfo);
-    Map<String, CommandInfo> colorControlClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlcolorLoopSetCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
-        new CommandParameterInfo("updateFlags", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "updateFlags", colorControlcolorLoopSetupdateFlagsCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetactionCommandParameterInfo =
-        new CommandParameterInfo("action", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "action", colorControlcolorLoopSetactionCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetdirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "direction", colorControlcolorLoopSetdirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSettimeCommandParameterInfo =
-        new CommandParameterInfo("time", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "time", colorControlcolorLoopSettimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetstartHueCommandParameterInfo =
-        new CommandParameterInfo("startHue", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "startHue", colorControlcolorLoopSetstartHueCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlcolorLoopSetoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_colorLoopSet_commandParams.put(
-        "optionsOverride", colorControl_colorLoopSet_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlcolorLoopSetCommandParams.put(
-        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlcolorLoopSetoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "optionsMask", colorControlcolorLoopSetoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlcolorLoopSetoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlcolorLoopSetCommandParams.put(
-        "optionsOverride", colorControlcolorLoopSetoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlcolorLoopSetCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .colorLoopSet(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("updateFlags"),
-                      (Integer) commandArguments.get("action"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("time"),
-                      (Integer) commandArguments.get("startHue"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_colorLoopSet_commandParams);
-    colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_enhancedMoveHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter enhancedMoveHue_moveMode_commandParameter =
-        new CommandParameter("moveMode", int.class);
-    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_moveMode_commandParameter);
-
-    CommandParameter enhancedMoveHue_rate_commandParameter =
-        new CommandParameter("rate", int.class);
-    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_rate_commandParameter);
-
-    CommandParameter enhancedMoveHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveHue_commandParams.add(enhancedMoveHue_optionsMask_commandParameter);
-
-    CommandParameter enhancedMoveHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveHue_commandParams.add(
-        enhancedMoveHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_enhancedMoveHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlcolorLoopSetCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
-    Map<String, CommandParameter> colorControlenhancedMoveHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlenhancedMoveHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "moveMode", colorControlenhancedMoveHuemoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "rate", colorControlenhancedMoveHuerateCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveHueoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlenhancedMoveHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_enhancedMoveHue_commandParams.put(
-        "optionsOverride", colorControl_enhancedMoveHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlenhancedMoveHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlenhancedMoveHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlenhancedMoveHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_enhancedMoveHue_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_enhancedMoveToHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter enhancedMoveToHue_enhancedHue_commandParameter =
-        new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHue_commandParams.add(
-        enhancedMoveToHue_enhancedHue_commandParameter);
-
-    CommandParameter enhancedMoveToHue_direction_commandParameter =
-        new CommandParameter("direction", int.class);
-    colorControl_enhancedMoveToHue_commandParams.add(enhancedMoveToHue_direction_commandParameter);
-
-    CommandParameter enhancedMoveToHue_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHue_commandParams.add(
-        enhancedMoveToHue_transitionTime_commandParameter);
-
-    CommandParameter enhancedMoveToHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHue_commandParams.add(
-        enhancedMoveToHue_optionsMask_commandParameter);
-
-    CommandParameter enhancedMoveToHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveToHue_commandParams.add(
-        enhancedMoveToHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_enhancedMoveToHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlenhancedMoveHueCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
-    Map<String, CommandParameter> colorControlenhancedMoveToHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put(
-        "enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
-    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlenhancedMoveToHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", int.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueenhancedHueCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", int.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "direction", colorControlenhancedMoveToHuedirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "transitionTime", colorControlenhancedMoveToHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlenhancedMoveToHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_enhancedMoveToHue_commandParams.put(
-        "optionsOverride", colorControl_enhancedMoveToHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlenhancedMoveToHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlenhancedMoveToHueCommandParams.put(
-        "optionsOverride", colorControlenhancedMoveToHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlenhancedMoveToHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveToHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("enhancedHue"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_enhancedMoveToHue_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter enhancedMoveToHueAndSaturation_enhancedHue_commandParameter =
-        new CommandParameter("enhancedHue", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
-        enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
-
-    CommandParameter enhancedMoveToHueAndSaturation_saturation_commandParameter =
-        new CommandParameter("saturation", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
-        enhancedMoveToHueAndSaturation_saturation_commandParameter);
-
-    CommandParameter enhancedMoveToHueAndSaturation_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
-        enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
-
-    CommandParameter enhancedMoveToHueAndSaturation_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
-        enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
-
-    CommandParameter enhancedMoveToHueAndSaturation_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedMoveToHueAndSaturation_commandParams.add(
-        enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlenhancedMoveToHueCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlenhancedMoveToHueAndSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
-        new CommandParameterInfo("enhancedHue", int.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "enhancedHue", colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", int.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlenhancedMoveToHueAndSaturationsaturationCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-            new CommandParameterInfo("transitionTime", int.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "transitionTime",
-        colorControlenhancedMoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlenhancedMoveToHueAndSaturationoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-            new CommandParameterInfo("optionsOverride", int.class);
-    colorControlenhancedMoveToHueAndSaturationCommandParams.put(
-        "optionsOverride",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        colorControlenhancedMoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlenhancedMoveToHueAndSaturationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedMoveToHueAndSaturation(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("enhancedHue"),
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_enhancedMoveToHueAndSaturation_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_enhancedStepHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter enhancedStepHue_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_stepMode_commandParameter);
-
-    CommandParameter enhancedStepHue_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_stepSize_commandParameter);
-
-    CommandParameter enhancedStepHue_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_transitionTime_commandParameter);
-
-    CommandParameter enhancedStepHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_enhancedStepHue_commandParams.add(enhancedStepHue_optionsMask_commandParameter);
-
-    CommandParameter enhancedStepHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_enhancedStepHue_commandParams.add(
-        enhancedStepHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_enhancedStepHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlenhancedMoveToHueAndSaturationCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlenhancedStepHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlenhancedStepHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "stepMode", colorControlenhancedStepHuestepModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedStepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "stepSize", colorControlenhancedStepHuestepSizeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedStepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "transitionTime", colorControlenhancedStepHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlenhancedStepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "optionsMask", colorControlenhancedStepHueoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlenhancedStepHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_enhancedStepHue_commandParams.put(
-        "optionsOverride", colorControl_enhancedStepHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlenhancedStepHueCommandParams.put(
-        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlenhancedStepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlenhancedStepHueCommandParams.put(
-        "optionsOverride", colorControlenhancedStepHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlenhancedStepHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .enhancedStepHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_enhancedStepHue_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveColor_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveColor_rateX_commandParameter = new CommandParameter("rateX", int.class);
-    colorControl_moveColor_commandParams.add(moveColor_rateX_commandParameter);
-
-    CommandParameter moveColor_rateY_commandParameter = new CommandParameter("rateY", int.class);
-    colorControl_moveColor_commandParams.add(moveColor_rateY_commandParameter);
-
-    CommandParameter moveColor_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveColor_commandParams.add(moveColor_optionsMask_commandParameter);
-
-    CommandParameter moveColor_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveColor_commandParams.add(moveColor_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveColor_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlenhancedStepHueCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("enhancedStepHue", colorControlenhancedStepHueCommandInfo);
-    Map<String, CommandParameter> colorControlmoveColorCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put(
-        "enhancedStepHue", colorControlenhancedStepHueCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveColorCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
-        new CommandParameterInfo("rateX", int.class);
-    colorControlmoveColorCommandParams.put("rateX", colorControlmoveColorrateXCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorrateYCommandParameterInfo =
-        new CommandParameterInfo("rateY", int.class);
-    colorControlmoveColorCommandParams.put("rateY", colorControlmoveColorrateYCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveColorCommandParams.put(
-        "optionsMask", colorControlmoveColoroptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveColoroptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveColor_commandParams.put(
-        "optionsOverride", colorControl_moveColor_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveColorCommandParams.put(
-        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveColorCommandParams.put(
-        "optionsOverride", colorControlmoveColoroptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveColorCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveColor(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("rateX"),
-                      (Integer) commandArguments.get("rateY"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveColor_commandParams);
-    colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveColorTemperature_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveColorTemperature_moveMode_commandParameter =
-        new CommandParameter("moveMode", int.class);
-    colorControl_moveColorTemperature_commandParams.add(
-        moveColorTemperature_moveMode_commandParameter);
-
-    CommandParameter moveColorTemperature_rate_commandParameter =
-        new CommandParameter("rate", int.class);
-    colorControl_moveColorTemperature_commandParams.add(moveColorTemperature_rate_commandParameter);
-
-    CommandParameter moveColorTemperature_colorTemperatureMinimum_commandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_moveColorTemperature_commandParams.add(
-        moveColorTemperature_colorTemperatureMinimum_commandParameter);
-
-    CommandParameter moveColorTemperature_colorTemperatureMaximum_commandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_moveColorTemperature_commandParams.add(
-        moveColorTemperature_colorTemperatureMaximum_commandParameter);
-
-    CommandParameter moveColorTemperature_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveColorTemperature_commandParams.add(
-        moveColorTemperature_optionsMask_commandParameter);
-
-    CommandParameter moveColorTemperature_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveColorTemperature_commandParams.add(
-        moveColorTemperature_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveColorTemperature_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveColorCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveColor", colorControlmoveColorCommandInfo);
-    Map<String, CommandParameter> colorControlmoveColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("moveColor", colorControlmoveColorCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveColorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "moveMode", colorControlmoveColorTemperaturemoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorTemperaturerateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimum", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "colorTemperatureMinimum",
-        colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximum", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "colorTemperatureMaximum",
-        colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveColorTemperatureoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveColorTemperature_commandParams.put(
-        "optionsOverride", colorControl_moveColorTemperature_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveColorTemperatureoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveColorTemperatureCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveColorTemperature(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("colorTemperatureMinimum"),
-                      (Integer) commandArguments.get("colorTemperatureMaximum"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveColorTemperature_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveHue_moveMode_commandParameter =
-        new CommandParameter("moveMode", int.class);
-    colorControl_moveHue_commandParams.add(moveHue_moveMode_commandParameter);
-
-    CommandParameter moveHue_rate_commandParameter = new CommandParameter("rate", int.class);
-    colorControl_moveHue_commandParams.add(moveHue_rate_commandParameter);
-
-    CommandParameter moveHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveHue_commandParams.add(moveHue_optionsMask_commandParameter);
-
-    CommandParameter moveHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveHue_commandParams.add(moveHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveColorTemperatureCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlmoveHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    colorControlmoveHueCommandParams.put(
-        "moveMode", colorControlmoveHuemoveModeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveHue_commandParams.put(
-        "optionsOverride", colorControl_moveHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveHueCommandParams.put(
-        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveHuerateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    colorControlmoveHueCommandParams.put("rate", colorControlmoveHuerateCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveHueCommandParams.put(
-        "optionsMask", colorControlmoveHueoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveHueCommandParams.put(
-        "optionsOverride", colorControlmoveHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveHue_commandParams);
-    colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveSaturation_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveSaturation_moveMode_commandParameter =
-        new CommandParameter("moveMode", int.class);
-    colorControl_moveSaturation_commandParams.add(moveSaturation_moveMode_commandParameter);
-
-    CommandParameter moveSaturation_rate_commandParameter = new CommandParameter("rate", int.class);
-    colorControl_moveSaturation_commandParams.add(moveSaturation_rate_commandParameter);
-
-    CommandParameter moveSaturation_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveSaturation_commandParams.add(moveSaturation_optionsMask_commandParameter);
-
-    CommandParameter moveSaturation_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveSaturation_commandParams.add(moveSaturation_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveSaturation_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveHueCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveHue", colorControlmoveHueCommandInfo);
-    Map<String, CommandParameter> colorControlmoveSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("moveHue", colorControlmoveHueCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveSaturationCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    colorControlmoveSaturationCommandParams.put(
-        "moveMode", colorControlmoveSaturationmoveModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveSaturationrateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    colorControlmoveSaturationCommandParams.put(
-        "rate", colorControlmoveSaturationrateCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveSaturationCommandParams.put(
-        "optionsMask", colorControlmoveSaturationoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveSaturationoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveSaturation_commandParams.put(
-        "optionsOverride", colorControl_moveSaturation_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveSaturationoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveSaturationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveSaturation(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveSaturation_commandParams);
-    colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveToColor_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToColor_colorX_commandParameter =
-        new CommandParameter("colorX", int.class);
-    colorControl_moveToColor_commandParams.add(moveToColor_colorX_commandParameter);
-
-    CommandParameter moveToColor_colorY_commandParameter =
-        new CommandParameter("colorY", int.class);
-    colorControl_moveToColor_commandParams.add(moveToColor_colorY_commandParameter);
-
-    CommandParameter moveToColor_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColor_commandParams.add(moveToColor_transitionTime_commandParameter);
-
-    CommandParameter moveToColor_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColor_commandParams.add(moveToColor_optionsMask_commandParameter);
-
-    CommandParameter moveToColor_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToColor_commandParams.add(moveToColor_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveToColor_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveSaturationCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveSaturation", colorControlmoveSaturationCommandInfo);
-    Map<String, CommandParameter> colorControlmoveToColorCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("moveSaturation", colorControlmoveSaturationCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveToColorCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
-        new CommandParameterInfo("colorX", int.class);
-    colorControlmoveToColorCommandParams.put(
-        "colorX", colorControlmoveToColorcolorXCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColorcolorYCommandParameterInfo =
-        new CommandParameterInfo("colorY", int.class);
-    colorControlmoveToColorCommandParams.put(
-        "colorY", colorControlmoveToColorcolorYCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlmoveToColorCommandParams.put(
-        "transitionTime", colorControlmoveToColortransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveToColorCommandParams.put(
-        "optionsMask", colorControlmoveToColoroptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveToColoroptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveToColor_commandParams.put(
-        "optionsOverride", colorControl_moveToColor_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveToColorCommandParams.put(
-        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveToColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveToColorCommandParams.put(
-        "optionsOverride", colorControlmoveToColoroptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveToColorCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToColor(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("colorX"),
-                      (Integer) commandArguments.get("colorY"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveToColor_commandParams);
-    colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveToColorTemperature_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToColorTemperature_colorTemperature_commandParameter =
-        new CommandParameter("colorTemperature", int.class);
-    colorControl_moveToColorTemperature_commandParams.add(
-        moveToColorTemperature_colorTemperature_commandParameter);
-
-    CommandParameter moveToColorTemperature_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_moveToColorTemperature_commandParams.add(
-        moveToColorTemperature_transitionTime_commandParameter);
-
-    CommandParameter moveToColorTemperature_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveToColorTemperature_commandParams.add(
-        moveToColorTemperature_optionsMask_commandParameter);
-
-    CommandParameter moveToColorTemperature_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToColorTemperature_commandParams.add(
-        moveToColorTemperature_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveToColorTemperature_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveToColorCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveToColor", colorControlmoveToColorCommandInfo);
-    Map<String, CommandParameter> colorControlmoveToColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("moveToColor", colorControlmoveToColorCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveToColorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("colorTemperature", int.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "colorTemperature", colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "transitionTime", colorControlmoveToColorTemperaturetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsMask", colorControlmoveToColorTemperatureoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveToColorTemperatureoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveToColorTemperature_commandParams.put(
-        "optionsOverride", colorControl_moveToColorTemperature_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveToColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlmoveToColorTemperatureoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveToColorTemperatureCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToColorTemperature(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("colorTemperature"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveToColorTemperature_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveToHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToHue_hue_commandParameter = new CommandParameter("hue", int.class);
-    colorControl_moveToHue_commandParams.add(moveToHue_hue_commandParameter);
-
-    CommandParameter moveToHue_direction_commandParameter =
-        new CommandParameter("direction", int.class);
-    colorControl_moveToHue_commandParams.add(moveToHue_direction_commandParameter);
-
-    CommandParameter moveToHue_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHue_commandParams.add(moveToHue_transitionTime_commandParameter);
-
-    CommandParameter moveToHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHue_commandParams.add(moveToHue_optionsMask_commandParameter);
-
-    CommandParameter moveToHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToHue_commandParams.add(moveToHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveToHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveToColorTemperatureCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlmoveToHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveToHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
-        new CommandParameterInfo("hue", int.class);
-    colorControlmoveToHueCommandParams.put("hue", colorControlmoveToHuehueCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHuedirectionCommandParameterInfo =
-        new CommandParameterInfo("direction", int.class);
-    colorControlmoveToHueCommandParams.put(
-        "direction", colorControlmoveToHuedirectionCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlmoveToHueCommandParams.put(
-        "transitionTime", colorControlmoveToHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveToHueCommandParams.put(
-        "optionsMask", colorControlmoveToHueoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveToHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveToHue_commandParams.put(
-        "optionsOverride", colorControl_moveToHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveToHueCommandParams.put(
-        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveToHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveToHueCommandParams.put(
-        "optionsOverride", colorControlmoveToHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveToHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("hue"),
-                      (Integer) commandArguments.get("direction"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveToHue_commandParams);
-    colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveToHueAndSaturation_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToHueAndSaturation_hue_commandParameter =
-        new CommandParameter("hue", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.add(
-        moveToHueAndSaturation_hue_commandParameter);
-
-    CommandParameter moveToHueAndSaturation_saturation_commandParameter =
-        new CommandParameter("saturation", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.add(
-        moveToHueAndSaturation_saturation_commandParameter);
-
-    CommandParameter moveToHueAndSaturation_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.add(
-        moveToHueAndSaturation_transitionTime_commandParameter);
-
-    CommandParameter moveToHueAndSaturation_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.add(
-        moveToHueAndSaturation_optionsMask_commandParameter);
-
-    CommandParameter moveToHueAndSaturation_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToHueAndSaturation_commandParams.add(
-        moveToHueAndSaturation_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveToHueAndSaturation_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveToHueCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveToHue", colorControlmoveToHueCommandInfo);
-    Map<String, CommandParameter> colorControlmoveToHueAndSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("moveToHue", colorControlmoveToHueCommandInfo);
-    Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveToHueAndSaturationCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
-        new CommandParameterInfo("hue", int.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "hue", colorControlmoveToHueAndSaturationhueCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", int.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "saturation", colorControlmoveToHueAndSaturationsaturationCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToHueAndSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToHueAndSaturationoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveToHueAndSaturation_commandParams.put(
-        "optionsOverride", colorControl_moveToHueAndSaturation_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveToHueAndSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToHueAndSaturationoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveToHueAndSaturationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToHueAndSaturation(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("hue"),
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveToHueAndSaturation_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_moveToSaturation_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToSaturation_saturation_commandParameter =
-        new CommandParameter("saturation", int.class);
-    colorControl_moveToSaturation_commandParams.add(moveToSaturation_saturation_commandParameter);
-
-    CommandParameter moveToSaturation_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_moveToSaturation_commandParams.add(
-        moveToSaturation_transitionTime_commandParameter);
-
-    CommandParameter moveToSaturation_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_moveToSaturation_commandParams.add(moveToSaturation_optionsMask_commandParameter);
-
-    CommandParameter moveToSaturation_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_moveToSaturation_commandParams.add(
-        moveToSaturation_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_moveToSaturation_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveToHueAndSaturationCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlmoveToSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlmoveToSaturationCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
-        new CommandParameterInfo("saturation", int.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "saturation", colorControlmoveToSaturationsaturationCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "transitionTime", colorControlmoveToSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlmoveToSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "optionsMask", colorControlmoveToSaturationoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlmoveToSaturationoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_moveToSaturation_commandParams.put(
-        "optionsOverride", colorControl_moveToSaturation_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlmoveToSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlmoveToSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlmoveToSaturationCommandParams.put(
-        "optionsOverride", colorControlmoveToSaturationoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlmoveToSaturationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .moveToSaturation(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("saturation"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_moveToSaturation_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "moveToSaturation", colorControl_moveToSaturation_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_stepColor_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stepColor_stepX_commandParameter = new CommandParameter("stepX", int.class);
-    colorControl_stepColor_commandParams.add(stepColor_stepX_commandParameter);
-
-    CommandParameter stepColor_stepY_commandParameter = new CommandParameter("stepY", int.class);
-    colorControl_stepColor_commandParams.add(stepColor_stepY_commandParameter);
-
-    CommandParameter stepColor_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_stepColor_commandParams.add(stepColor_transitionTime_commandParameter);
-
-    CommandParameter stepColor_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_stepColor_commandParams.add(stepColor_optionsMask_commandParameter);
-
-    CommandParameter stepColor_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_stepColor_commandParams.add(stepColor_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_stepColor_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlmoveToSaturationCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("moveToSaturation", colorControlmoveToSaturationCommandInfo);
-    Map<String, CommandParameter> colorControlstepColorCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put(
-        "moveToSaturation", colorControlmoveToSaturationCommandInfo);
-    Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlstepColorCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
-        new CommandParameterInfo("stepX", int.class);
-    colorControlstepColorCommandParams.put("stepX", colorControlstepColorstepXCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorstepYCommandParameterInfo =
-        new CommandParameterInfo("stepY", int.class);
-    colorControlstepColorCommandParams.put("stepY", colorControlstepColorstepYCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColortransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlstepColorCommandParams.put(
-        "transitionTime", colorControlstepColortransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColoroptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlstepColorCommandParams.put(
-        "optionsMask", colorControlstepColoroptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlstepColoroptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_stepColor_commandParams.put(
-        "optionsOverride", colorControl_stepColor_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlstepColorCommandParams.put(
-        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlstepColoroptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlstepColorCommandParams.put(
-        "optionsOverride", colorControlstepColoroptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlstepColorCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepColor(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepX"),
-                      (Integer) commandArguments.get("stepY"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_stepColor_commandParams);
-    colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_stepColorTemperature_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stepColorTemperature_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_stepMode_commandParameter);
-
-    CommandParameter stepColorTemperature_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_stepSize_commandParameter);
-
-    CommandParameter stepColorTemperature_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_transitionTime_commandParameter);
-
-    CommandParameter stepColorTemperature_colorTemperatureMinimum_commandParameter =
-        new CommandParameter("colorTemperatureMinimum", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_colorTemperatureMinimum_commandParameter);
-
-    CommandParameter stepColorTemperature_colorTemperatureMaximum_commandParameter =
-        new CommandParameter("colorTemperatureMaximum", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_colorTemperatureMaximum_commandParameter);
-
-    CommandParameter stepColorTemperature_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_optionsMask_commandParameter);
-
-    CommandParameter stepColorTemperature_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_stepColorTemperature_commandParams.add(
-        stepColorTemperature_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_stepColorTemperature_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlstepColorCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("stepColor", colorControlstepColorCommandInfo);
-    Map<String, CommandParameter> colorControlstepColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("stepColor", colorControlstepColorCommandInfo);
-    Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlstepColorTemperatureCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "stepMode", colorControlstepColorTemperaturestepModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorTemperaturestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "stepSize", colorControlstepColorTemperaturestepSizeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorTemperaturetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMinimum", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "colorTemperatureMinimum",
-        colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
-
-    CommandParameterInfo
-        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
-            new CommandParameterInfo("colorTemperatureMaximum", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "colorTemperatureMaximum",
-        colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "optionsMask", colorControlstepColorTemperatureoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlstepColorTemperatureoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_stepColorTemperature_commandParams.put(
-        "optionsOverride", colorControl_stepColorTemperature_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlstepColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlstepColorTemperatureCommandParams.put(
-        "optionsOverride", colorControlstepColorTemperatureoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlstepColorTemperatureCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepColorTemperature(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("colorTemperatureMinimum"),
-                      (Integer) commandArguments.get("colorTemperatureMaximum"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_stepColorTemperature_commandParams);
-    colorControl_ClusterCommandInfo.put(
-        "stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_stepHue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stepHue_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControl_stepHue_commandParams.add(stepHue_stepMode_commandParameter);
-
-    CommandParameter stepHue_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControl_stepHue_commandParams.add(stepHue_stepSize_commandParameter);
-
-    CommandParameter stepHue_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_stepHue_commandParams.add(stepHue_transitionTime_commandParameter);
-
-    CommandParameter stepHue_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_stepHue_commandParams.add(stepHue_optionsMask_commandParameter);
-
-    CommandParameter stepHue_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_stepHue_commandParams.add(stepHue_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_stepHue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlstepColorTemperatureCommandParams);
-    colorControlClusterCommandInfoMap.put(
-        "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> colorControlstepHueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlstepHueCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    colorControlstepHueCommandParams.put(
-        "stepMode", colorControlstepHuestepModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepHuestepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    colorControlstepHueCommandParams.put(
-        "stepSize", colorControlstepHuestepSizeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlstepHueoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_stepHue_commandParams.put(
-        "optionsOverride", colorControl_stepHue_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlstepHueCommandParams.put(
-        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlstepHuetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlstepHueCommandParams.put(
-        "transitionTime", colorControlstepHuetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepHueoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlstepHueCommandParams.put(
-        "optionsMask", colorControlstepHueoptionsMaskCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepHueoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlstepHueCommandParams.put(
-        "optionsOverride", colorControlstepHueoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlstepHueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepHue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_stepHue_commandParams);
-    colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_stepSaturation_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stepSaturation_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    colorControl_stepSaturation_commandParams.add(stepSaturation_stepMode_commandParameter);
-
-    CommandParameter stepSaturation_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    colorControl_stepSaturation_commandParams.add(stepSaturation_stepSize_commandParameter);
-
-    CommandParameter stepSaturation_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    colorControl_stepSaturation_commandParams.add(stepSaturation_transitionTime_commandParameter);
-
-    CommandParameter stepSaturation_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_stepSaturation_commandParams.add(stepSaturation_optionsMask_commandParameter);
-
-    CommandParameter stepSaturation_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_stepSaturation_commandParams.add(stepSaturation_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_stepSaturation_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlstepHueCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("stepHue", colorControlstepHueCommandInfo);
-    Map<String, CommandParameter> colorControlstepSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("stepHue", colorControlstepHueCommandInfo);
-    Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlstepSaturationCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    colorControlstepSaturationCommandParams.put(
-        "stepMode", colorControlstepSaturationstepModeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepSaturationstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    colorControlstepSaturationCommandParams.put(
-        "stepSize", colorControlstepSaturationstepSizeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepSaturationtransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    colorControlstepSaturationCommandParams.put(
-        "transitionTime", colorControlstepSaturationtransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo colorControlstepSaturationoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlstepSaturationCommandParams.put(
-        "optionsMask", colorControlstepSaturationoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlstepSaturationoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_stepSaturation_commandParams.put(
-        "optionsOverride", colorControl_stepSaturation_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlstepSaturationCommandParams.put(
-        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlstepSaturationoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlstepSaturationCommandParams.put(
-        "optionsOverride", colorControlstepSaturationoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlstepSaturationCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stepSaturation(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            colorControl_stepSaturation_commandParams);
-    colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> colorControl_stopMoveStep_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stopMoveStep_optionsMask_commandParameter =
-        new CommandParameter("optionsMask", int.class);
-    colorControl_stopMoveStep_commandParams.add(stopMoveStep_optionsMask_commandParameter);
-
-    CommandParameter stopMoveStep_optionsOverride_commandParameter =
-        new CommandParameter("optionsOverride", int.class);
-    colorControl_stopMoveStep_commandParams.add(stopMoveStep_optionsOverride_commandParameter);
-=======
-    Map<String, CommandParameter> colorControl_stopMoveStep_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlstepSaturationCommandParams);
-<<<<<<< HEAD
-    colorControlClusterCommandInfo.put("stepSaturation", colorControlstepSaturationCommandInfo);
-    Map<String, CommandParameter> colorControlstopMoveStepCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    colorControlClusterCommandInfoMap.put("stepSaturation", colorControlstepSaturationCommandInfo);
-    Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo colorControlstopMoveStepCommandParameterInfo =
-        new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
-        new CommandParameterInfo("optionsMask", int.class);
-    colorControlstopMoveStepCommandParams.put(
-        "optionsMask", colorControlstopMoveStepoptionsMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter colorControlstopMoveStepoptionsOverrideCommandParameter =
-        new CommandParameter("optionsOverride", int.class);
-<<<<<<< HEAD
-    colorControl_stopMoveStep_commandParams.put(
-        "optionsOverride", colorControl_stopMoveStep_optionsOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    colorControlstopMoveStepCommandParams.put(
-        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo colorControlstopMoveStepoptionsOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionsOverride", int.class);
-    colorControlstopMoveStepCommandParams.put(
-        "optionsOverride", colorControlstopMoveStepoptionsOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo colorControlstopMoveStepCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ColorControlCluster) cluster)
-                  .stopMoveStep(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("optionsMask"),
-                      (Integer) commandArguments.get("optionsOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            colorControlstopMoveStepCommandParams);
-    colorControlClusterCommandInfoMap.put("stopMoveStep", colorControlstopMoveStepCommandInfo);
-    // Populate cluster
-    ClusterInfo colorControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            colorControl_ClusterCommandInfo);
-    clusterMap.put("colorControl", colorControl_clusterInfo);
-    Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> contentLauncher_launchContent_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter launchContent_autoPlay_commandParameter =
-        new CommandParameter("autoPlay", boolean.class);
-    contentLauncher_launchContent_commandParams.add(launchContent_autoPlay_commandParameter);
-
-    CommandParameter launchContent_data_commandParameter =
-        new CommandParameter("data", String.class);
-    contentLauncher_launchContent_commandParams.add(launchContent_data_commandParameter);
-=======
-    Map<String, CommandParameter> contentLauncher_launchContent_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            colorControlClusterCommandInfo);
-    clusterMap.put("colorControl", colorControlClusterInfo);
-    Map<String, CommandInfo> contentLauncherClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> contentLauncherlaunchContentCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            colorControlClusterCommandInfoMap);
-    clusterMap.put("colorControl", colorControlClusterInfo);
-    Map<String, CommandInfo> contentLauncherClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo contentLauncherlaunchContentCommandParameterInfo =
-        new CommandParameterInfo(
-            "ContentLauncher",
-            ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
-    CommandParameterInfo contentLauncherlaunchContentautoPlayCommandParameterInfo =
-        new CommandParameterInfo("autoPlay", boolean.class);
-    contentLauncherlaunchContentCommandParams.put(
-        "autoPlay", contentLauncherlaunchContentautoPlayCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter contentLauncherlaunchContentdataCommandParameter =
-        new CommandParameter("data", String.class);
-<<<<<<< HEAD
-    contentLauncher_launchContent_commandParams.put(
-        "data", contentLauncher_launchContent_data_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    contentLauncherlaunchContentCommandParams.put(
-        "data", contentLauncherlaunchContentdataCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo contentLauncherlaunchContentdataCommandParameterInfo =
-        new CommandParameterInfo("data", String.class);
-    contentLauncherlaunchContentCommandParams.put(
-        "data", contentLauncherlaunchContentdataCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo contentLauncherlaunchContentCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .launchContent(
-                      (ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback) callback,
-                      (Boolean) commandArguments.get("autoPlay"),
-                      (String) commandArguments.get("data"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            contentLauncher_launchContent_commandParams);
-    contentLauncher_ClusterCommandInfo.put(
-        "launchContent", contentLauncher_launchContent_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> contentLauncher_launchURL_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter launchURL_contentURL_commandParameter =
-        new CommandParameter("contentURL", String.class);
-    contentLauncher_launchURL_commandParams.add(launchURL_contentURL_commandParameter);
-
-    CommandParameter launchURL_displayString_commandParameter =
-        new CommandParameter("displayString", String.class);
-    contentLauncher_launchURL_commandParams.add(launchURL_displayString_commandParameter);
-=======
-    Map<String, CommandParameter> contentLauncher_launchURL_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedLaunchContentResponseCallback(),
-            contentLauncherlaunchContentCommandParams);
-<<<<<<< HEAD
-    contentLauncherClusterCommandInfo.put("launchContent", contentLauncherlaunchContentCommandInfo);
-    Map<String, CommandParameter> contentLauncherlaunchURLCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    contentLauncherClusterCommandInfoMap.put(
-        "launchContent", contentLauncherlaunchContentCommandInfo);
-    Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo contentLauncherlaunchURLCommandParameterInfo =
-        new CommandParameterInfo(
-            "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
-    CommandParameterInfo contentLauncherlaunchURLcontentURLCommandParameterInfo =
-        new CommandParameterInfo("contentURL", String.class);
-    contentLauncherlaunchURLCommandParams.put(
-        "contentURL", contentLauncherlaunchURLcontentURLCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter contentLauncherlaunchURLdisplayStringCommandParameter =
-        new CommandParameter("displayString", String.class);
-<<<<<<< HEAD
-    contentLauncher_launchURL_commandParams.put(
-        "displayString", contentLauncher_launchURL_displayString_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    contentLauncherlaunchURLCommandParams.put(
-        "displayString", contentLauncherlaunchURLdisplayStringCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo contentLauncherlaunchURLdisplayStringCommandParameterInfo =
-        new CommandParameterInfo("displayString", String.class);
-    contentLauncherlaunchURLCommandParams.put(
-        "displayString", contentLauncherlaunchURLdisplayStringCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo contentLauncherlaunchURLCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ContentLauncherCluster) cluster)
-                  .launchURL(
-                      (ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback) callback,
-                      (String) commandArguments.get("contentURL"),
-                      (String) commandArguments.get("displayString"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedLaunchURLResponseCallback(),
-            contentLauncherlaunchURLCommandParams);
-    contentLauncherClusterCommandInfoMap.put("launchURL", contentLauncherlaunchURLCommandInfo);
-    // Populate cluster
-    ClusterInfo contentLauncherClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId),
-            contentLauncherClusterCommandInfoMap);
-    clusterMap.put("contentLauncher", contentLauncherClusterInfo);
-    Map<String, CommandInfo> descriptorClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo descriptorClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            descriptor_ClusterCommandInfo);
-    clusterMap.put("descriptor", descriptor_clusterInfo);
-    Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter retrieveLogsRequest_intent_commandParameter =
-        new CommandParameter("intent", int.class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.add(
-        retrieveLogsRequest_intent_commandParameter);
-
-    CommandParameter retrieveLogsRequest_requestedProtocol_commandParameter =
-        new CommandParameter("requestedProtocol", int.class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.add(
-        retrieveLogsRequest_requestedProtocol_commandParameter);
-
-    CommandParameter retrieveLogsRequest_transferFileDesignator_commandParameter =
-        new CommandParameter("transferFileDesignator", byte[].class);
-    diagnosticLogs_retrieveLogsRequest_commandParams.add(
-        retrieveLogsRequest_transferFileDesignator_commandParameter);
-=======
-    Map<String, CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            descriptorClusterCommandInfo);
-    clusterMap.put("descriptor", descriptorClusterInfo);
-    Map<String, CommandInfo> diagnosticLogsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> diagnosticLogsretrieveLogsRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            descriptorClusterCommandInfoMap);
-    clusterMap.put("descriptor", descriptorClusterInfo);
-    Map<String, CommandInfo> diagnosticLogsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "DiagnosticLogs",
-            ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback.class);
-    CommandParameterInfo diagnosticLogsretrieveLogsRequestintentCommandParameterInfo =
-        new CommandParameterInfo("intent", int.class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "intent", diagnosticLogsretrieveLogsRequestintentCommandParameterInfo);
-
-    CommandParameterInfo diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo =
-        new CommandParameterInfo("requestedProtocol", int.class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "requestedProtocol",
-        diagnosticLogsretrieveLogsRequestrequestedProtocolCommandParameterInfo);
-
-    CommandParameterInfo
-        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo =
-            new CommandParameterInfo("transferFileDesignator", byte[].class);
-    diagnosticLogsretrieveLogsRequestCommandParams.put(
-        "transferFileDesignator",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        diagnosticLogsretrieveLogsRequesttransferFileDesignatorCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo diagnosticLogsretrieveLogsRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DiagnosticLogsCluster) cluster)
-                  .retrieveLogsRequest(
-                      (ChipClusters.DiagnosticLogsCluster.RetrieveLogsResponseCallback) callback,
-                      (Integer) commandArguments.get("intent"),
-                      (Integer) commandArguments.get("requestedProtocol"),
-                      (byte[]) commandArguments.get("transferFileDesignator"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedRetrieveLogsResponseCallback(),
-            diagnosticLogsretrieveLogsRequestCommandParams);
-    diagnosticLogsClusterCommandInfoMap.put(
-        "retrieveLogsRequest", diagnosticLogsretrieveLogsRequestCommandInfo);
-    // Populate cluster
-    ClusterInfo diagnosticLogsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            diagnosticLogs_ClusterCommandInfo);
-    clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
-    Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearAllPins_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> doorLock_clearAllPins_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            diagnosticLogsClusterCommandInfo);
-    clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
-    Map<String, CommandInfo> doorLockClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> doorLockclearAllPinsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            diagnosticLogsClusterCommandInfoMap);
-    clusterMap.put("diagnosticLogs", diagnosticLogsClusterInfo);
-    Map<String, CommandInfo> doorLockClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> doorLockclearAllPinsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearAllPinsCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo doorLockclearAllPinsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearAllPins(
-                      (ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearAllPins_commandParams);
-    doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearAllRfids_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> doorLock_clearAllRfids_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearAllPinsResponseCallback(),
-            doorLockclearAllPinsCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearAllPins", doorLockclearAllPinsCommandInfo);
-    Map<String, CommandParameter> doorLockclearAllRfidsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("clearAllPins", doorLockclearAllPinsCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearAllRfidsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearAllRfidsCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo doorLockclearAllRfidsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearAllRfids(
-                      (ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearAllRfids_commandParams);
-    doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearHolidaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter clearHolidaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_clearHolidaySchedule_commandParams.add(
-        clearHolidaySchedule_scheduleId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_clearHolidaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearAllRfidsResponseCallback(),
-            doorLockclearAllRfidsCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
-    Map<String, CommandParameter> doorLockclearHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearHolidayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockclearHolidaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
-<<<<<<< HEAD
-    doorLock_clearHolidaySchedule_commandParams.put(
-        "scheduleId", doorLock_clearHolidaySchedule_scheduleId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockclearHolidayScheduleCommandParams.put(
-        "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockclearHolidaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockclearHolidayScheduleCommandParams.put(
-        "scheduleId", doorLockclearHolidaySchedulescheduleIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockclearHolidayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearHolidaySchedule(
-                      (ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearHolidaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put(
-        "clearHolidaySchedule", doorLock_clearHolidaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearPin_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_clearPin_commandParams.add(clearPin_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_clearPin_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearHolidayScheduleResponseCallback(),
-            doorLockclearHolidayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockclearPinCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put(
-        "clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearPinCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearPinCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockclearPinuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_clearPin_commandParams.put("userId", doorLock_clearPin_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockclearPinuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockclearPinCommandParams.put("userId", doorLockclearPinuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockclearPinCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearPin(
-                      (ChipClusters.DoorLockCluster.ClearPinResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearPin_commandParams);
-    doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearRfid_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_clearRfid_commandParams.add(clearRfid_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_clearRfid_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearPinResponseCallback(),
-            doorLockclearPinCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearPin", doorLockclearPinCommandInfo);
-    Map<String, CommandParameter> doorLockclearRfidCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("clearPin", doorLockclearPinCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearRfidCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearRfidCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockclearRfiduserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_clearRfid_commandParams.put("userId", doorLock_clearRfid_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockclearRfiduserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockclearRfidCommandParams.put("userId", doorLockclearRfiduserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockclearRfidCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearRfid(
-                      (ChipClusters.DoorLockCluster.ClearRfidResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearRfid_commandParams);
-    doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearWeekdaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter clearWeekdaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_clearWeekdaySchedule_commandParams.add(
-        clearWeekdaySchedule_scheduleId_commandParameter);
-
-    CommandParameter clearWeekdaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_clearWeekdaySchedule_commandParams.add(clearWeekdaySchedule_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_clearWeekdaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearRfidResponseCallback(),
-            doorLockclearRfidCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearRfid", doorLockclearRfidCommandInfo);
-    Map<String, CommandParameter> doorLockclearWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("clearRfid", doorLockclearRfidCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearWeekdayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
-    CommandParameterInfo doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockclearWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLockclearWeekdaySchedulescheduleIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLockclearWeekdayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_clearWeekdaySchedule_commandParams.put(
-        "userId", doorLock_clearWeekdaySchedule_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockclearWeekdayScheduleCommandParams.put(
-        "userId", doorLockclearWeekdayScheduleuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockclearWeekdayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockclearWeekdayScheduleCommandParams.put(
-        "userId", doorLockclearWeekdayScheduleuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockclearWeekdayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearWeekdaySchedule(
-                      (ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearWeekdaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put(
-        "clearWeekdaySchedule", doorLock_clearWeekdaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_clearYeardaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter clearYeardaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_clearYeardaySchedule_commandParams.add(
-        clearYeardaySchedule_scheduleId_commandParameter);
-
-    CommandParameter clearYeardaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_clearYeardaySchedule_commandParams.add(clearYeardaySchedule_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_clearYeardaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearWeekdayScheduleResponseCallback(),
-            doorLockclearWeekdayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockclearYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put(
-        "clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockclearYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockclearYeardayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
-    CommandParameterInfo doorLockclearYeardaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockclearYeardayScheduleCommandParams.put(
-        "scheduleId", doorLockclearYeardaySchedulescheduleIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLockclearYeardayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_clearYeardaySchedule_commandParams.put(
-        "userId", doorLock_clearYeardaySchedule_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockclearYeardayScheduleCommandParams.put(
-        "userId", doorLockclearYeardayScheduleuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockclearYeardayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockclearYeardayScheduleCommandParams.put(
-        "userId", doorLockclearYeardayScheduleuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockclearYeardayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .clearYeardaySchedule(
-                      (ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_clearYeardaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put(
-        "clearYeardaySchedule", doorLock_clearYeardaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getHolidaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getHolidaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_getHolidaySchedule_commandParams.add(getHolidaySchedule_scheduleId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getHolidaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedClearYeardayScheduleResponseCallback(),
-            doorLockclearYeardayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockgetHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put(
-        "clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetHolidayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockgetHolidaySchedulescheduleIdCommandParameter =
-        new CommandParameter("scheduleId", int.class);
-<<<<<<< HEAD
-    doorLock_getHolidaySchedule_commandParams.put(
-        "scheduleId", doorLock_getHolidaySchedule_scheduleId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetHolidayScheduleCommandParams.put(
-        "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetHolidaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockgetHolidayScheduleCommandParams.put(
-        "scheduleId", doorLockgetHolidaySchedulescheduleIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetHolidayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getHolidaySchedule(
-                      (ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getHolidaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getLogRecord_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getLogRecord_logIndex_commandParameter =
-        new CommandParameter("logIndex", int.class);
-    doorLock_getLogRecord_commandParams.add(getLogRecord_logIndex_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getLogRecord_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetHolidayScheduleResponseCallback(),
-            doorLockgetHolidayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockgetLogRecordCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetLogRecordCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetLogRecordCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockgetLogRecordlogIndexCommandParameter =
-        new CommandParameter("logIndex", int.class);
-<<<<<<< HEAD
-    doorLock_getLogRecord_commandParams.put(
-        "logIndex", doorLock_getLogRecord_logIndex_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetLogRecordCommandParams.put("logIndex", doorLockgetLogRecordlogIndexCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetLogRecordlogIndexCommandParameterInfo =
-        new CommandParameterInfo("logIndex", int.class);
-    doorLockgetLogRecordCommandParams.put(
-        "logIndex", doorLockgetLogRecordlogIndexCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetLogRecordCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getLogRecord(
-                      (ChipClusters.DoorLockCluster.GetLogRecordResponseCallback) callback,
-                      (Integer) commandArguments.get("logIndex"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getLogRecord_commandParams);
-    doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getPin_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_getPin_commandParams.add(getPin_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getPin_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetLogRecordResponseCallback(),
-            doorLockgetLogRecordCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getLogRecord", doorLockgetLogRecordCommandInfo);
-    Map<String, CommandParameter> doorLockgetPinCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter doorLockgetPinCommandParameter =
-        new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
-    CommandParameter doorLockgetPinuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_getPin_commandParams.put("userId", doorLock_getPin_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getLogRecord", doorLockgetLogRecordCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetPinCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetPinCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
-    CommandParameterInfo doorLockgetPinuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockgetPinCommandParams.put("userId", doorLockgetPinuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetPinCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getPin(
-                      (ChipClusters.DoorLockCluster.GetPinResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getPin_commandParams);
-    doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getRfid_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_getRfid_commandParams.add(getRfid_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getRfid_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetPinResponseCallback(),
-            doorLockgetPinCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getPin", doorLockgetPinCommandInfo);
-    Map<String, CommandParameter> doorLockgetRfidCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getPin", doorLockgetPinCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetRfidCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetRfidCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockgetRfiduserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_getRfid_commandParams.put("userId", doorLock_getRfid_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetRfiduserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockgetRfidCommandParams.put("userId", doorLockgetRfiduserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetRfidCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getRfid(
-                      (ChipClusters.DoorLockCluster.GetRfidResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getRfid_commandParams);
-    doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getUserType_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getUserType_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_getUserType_commandParams.add(getUserType_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getUserType_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetRfidResponseCallback(),
-            doorLockgetRfidCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getRfid", doorLockgetRfidCommandInfo);
-    Map<String, CommandParameter> doorLockgetUserTypeCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getRfid", doorLockgetRfidCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetUserTypeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetUserTypeCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockgetUserTypeuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_getUserType_commandParams.put("userId", doorLock_getUserType_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetUserTypeCommandParams.put("userId", doorLockgetUserTypeuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetUserTypeuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockgetUserTypeCommandParams.put("userId", doorLockgetUserTypeuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetUserTypeCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getUserType(
-                      (ChipClusters.DoorLockCluster.GetUserTypeResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getUserType_commandParams);
-    doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getWeekdaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getWeekdaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_getWeekdaySchedule_commandParams.add(getWeekdaySchedule_scheduleId_commandParameter);
-
-    CommandParameter getWeekdaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_getWeekdaySchedule_commandParams.add(getWeekdaySchedule_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getWeekdaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetUserTypeResponseCallback(),
-            doorLockgetUserTypeCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getUserType", doorLockgetUserTypeCommandInfo);
-    Map<String, CommandParameter> doorLockgetWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getUserType", doorLockgetUserTypeCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetWeekdayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
-    CommandParameterInfo doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockgetWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLockgetWeekdaySchedulescheduleIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLockgetWeekdayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_getWeekdaySchedule_commandParams.put(
-        "userId", doorLock_getWeekdaySchedule_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetWeekdayScheduleCommandParams.put(
-        "userId", doorLockgetWeekdayScheduleuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetWeekdayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockgetWeekdayScheduleCommandParams.put(
-        "userId", doorLockgetWeekdayScheduleuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetWeekdayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getWeekdaySchedule(
-                      (ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getWeekdaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_getYeardaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getYeardaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_getYeardaySchedule_commandParams.add(getYeardaySchedule_scheduleId_commandParameter);
-
-    CommandParameter getYeardaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_getYeardaySchedule_commandParams.add(getYeardaySchedule_userId_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_getYeardaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetWeekdayScheduleResponseCallback(),
-            doorLockgetWeekdayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockgetYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockgetYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockgetYeardayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
-    CommandParameterInfo doorLockgetYeardaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLockgetYeardayScheduleCommandParams.put(
-        "scheduleId", doorLockgetYeardaySchedulescheduleIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLockgetYeardayScheduleuserIdCommandParameter =
-        new CommandParameter("userId", int.class);
-<<<<<<< HEAD
-    doorLock_getYeardaySchedule_commandParams.put(
-        "userId", doorLock_getYeardaySchedule_userId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockgetYeardayScheduleCommandParams.put(
-        "userId", doorLockgetYeardayScheduleuserIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockgetYeardayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLockgetYeardayScheduleCommandParams.put(
-        "userId", doorLockgetYeardayScheduleuserIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockgetYeardayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .getYeardaySchedule(
-                      (ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_getYeardaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_lockDoor_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_lockDoor_commandParams.add(lockDoor_pin_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_lockDoor_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetYeardayScheduleResponseCallback(),
-            doorLockgetYeardayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLocklockDoorCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocklockDoorCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLocklockDoorpinCommandParameter =
-        new CommandParameter("pin", byte[].class);
-<<<<<<< HEAD
-    doorLock_lockDoor_commandParams.put("pin", doorLock_lockDoor_pin_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocklockDoorpinCommandParameterInfo =
-        new CommandParameterInfo("pin", byte[].class);
-    doorLocklockDoorCommandParams.put("pin", doorLocklockDoorpinCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocklockDoorCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .lockDoor(
-                      (ChipClusters.DoorLockCluster.LockDoorResponseCallback) callback,
-                      (byte[]) commandArguments.get("pin"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_lockDoor_commandParams);
-    doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setHolidaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setHolidaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_setHolidaySchedule_commandParams.add(setHolidaySchedule_scheduleId_commandParameter);
-
-    CommandParameter setHolidaySchedule_localStartTime_commandParameter =
-        new CommandParameter("localStartTime", long.class);
-    doorLock_setHolidaySchedule_commandParams.add(
-        setHolidaySchedule_localStartTime_commandParameter);
-
-    CommandParameter setHolidaySchedule_localEndTime_commandParameter =
-        new CommandParameter("localEndTime", long.class);
-    doorLock_setHolidaySchedule_commandParams.add(setHolidaySchedule_localEndTime_commandParameter);
-
-    CommandParameter setHolidaySchedule_operatingModeDuringHoliday_commandParameter =
-        new CommandParameter("operatingModeDuringHoliday", int.class);
-    doorLock_setHolidaySchedule_commandParams.add(
-        setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setHolidaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedLockDoorResponseCallback(),
-            doorLocklockDoorCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("lockDoor", doorLocklockDoorCommandInfo);
-    Map<String, CommandParameter> doorLocksetHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("lockDoor", doorLocklockDoorCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetHolidayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
-    CommandParameterInfo doorLocksetHolidaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "scheduleId", doorLocksetHolidaySchedulescheduleIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", long.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "localStartTime", doorLocksetHolidaySchedulelocalStartTimeCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", long.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "localEndTime", doorLocksetHolidaySchedulelocalEndTimeCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo =
-        new CommandParameterInfo("operatingModeDuringHoliday", int.class);
-    doorLocksetHolidayScheduleCommandParams.put(
-        "operatingModeDuringHoliday",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        doorLocksetHolidayScheduleoperatingModeDuringHolidayCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetHolidayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setHolidaySchedule(
-                      (ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Long) commandArguments.get("localStartTime"),
-                      (Long) commandArguments.get("localEndTime"),
-                      (Integer) commandArguments.get("operatingModeDuringHoliday"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setHolidaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setPin_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setPin_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_setPin_commandParams.add(setPin_userId_commandParameter);
-
-    CommandParameter setPin_userStatus_commandParameter =
-        new CommandParameter("userStatus", int.class);
-    doorLock_setPin_commandParams.add(setPin_userStatus_commandParameter);
-
-    CommandParameter setPin_userType_commandParameter = new CommandParameter("userType", int.class);
-    doorLock_setPin_commandParams.add(setPin_userType_commandParameter);
-
-    CommandParameter setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_setPin_commandParams.add(setPin_pin_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setPin_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetHolidayScheduleResponseCallback(),
-            doorLocksetHolidayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLocksetPinCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetPinCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetPinCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
-    CommandParameterInfo doorLocksetPinuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLocksetPinCommandParams.put("userId", doorLocksetPinuserIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetPinuserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", int.class);
-    doorLocksetPinCommandParams.put("userStatus", doorLocksetPinuserStatusCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetPinuserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", int.class);
-    doorLocksetPinCommandParams.put("userType", doorLocksetPinuserTypeCommandParameterInfo);
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-    CommandParameter doorLock_setPin_pin_commandParameter =
-        new CommandParameter("pin", byte[].class);
-    doorLock_setPin_commandParams.put("pin", doorLock_setPin_pin_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    CommandParameter doorLocksetPinpinCommandParameter = new CommandParameter("pin", byte[].class);
-    doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocksetPinpinCommandParameterInfo =
-        new CommandParameterInfo("pin", byte[].class);
-    doorLocksetPinCommandParams.put("pin", doorLocksetPinpinCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetPinCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setPin(
-                      (ChipClusters.DoorLockCluster.SetPinResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"),
-                      (Integer) commandArguments.get("userStatus"),
-                      (Integer) commandArguments.get("userType"),
-                      (byte[]) commandArguments.get("pin"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setPin_commandParams);
-    doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setRfid_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-    doorLock_setRfid_commandParams.add(setRfid_userId_commandParameter);
-
-    CommandParameter setRfid_userStatus_commandParameter =
-        new CommandParameter("userStatus", int.class);
-    doorLock_setRfid_commandParams.add(setRfid_userStatus_commandParameter);
-
-    CommandParameter setRfid_userType_commandParameter =
-        new CommandParameter("userType", int.class);
-    doorLock_setRfid_commandParams.add(setRfid_userType_commandParameter);
-
-    CommandParameter setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
-    doorLock_setRfid_commandParams.add(setRfid_id_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setRfid_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetPinResponseCallback(),
-            doorLocksetPinCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setPin", doorLocksetPinCommandInfo);
-    Map<String, CommandParameter> doorLocksetRfidCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setPin", doorLocksetPinCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetRfidCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetRfidCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
-    CommandParameterInfo doorLocksetRfiduserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLocksetRfidCommandParams.put("userId", doorLocksetRfiduserIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetRfiduserStatusCommandParameterInfo =
-        new CommandParameterInfo("userStatus", int.class);
-    doorLocksetRfidCommandParams.put("userStatus", doorLocksetRfiduserStatusCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetRfiduserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", int.class);
-    doorLocksetRfidCommandParams.put("userType", doorLocksetRfiduserTypeCommandParameterInfo);
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-    CommandParameter doorLock_setRfid_id_commandParameter =
-        new CommandParameter("id", byte[].class);
-    doorLock_setRfid_commandParams.put("id", doorLock_setRfid_id_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    CommandParameter doorLocksetRfididCommandParameter = new CommandParameter("id", byte[].class);
-    doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocksetRfididCommandParameterInfo =
-        new CommandParameterInfo("id", byte[].class);
-    doorLocksetRfidCommandParams.put("id", doorLocksetRfididCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetRfidCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setRfid(
-                      (ChipClusters.DoorLockCluster.SetRfidResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"),
-                      (Integer) commandArguments.get("userStatus"),
-                      (Integer) commandArguments.get("userType"),
-                      (byte[]) commandArguments.get("id"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setRfid_commandParams);
-    doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setUserType_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setUserType_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_setUserType_commandParams.add(setUserType_userId_commandParameter);
-
-    CommandParameter setUserType_userType_commandParameter =
-        new CommandParameter("userType", int.class);
-    doorLock_setUserType_commandParams.add(setUserType_userType_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setUserType_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetRfidResponseCallback(),
-            doorLocksetRfidCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setRfid", doorLocksetRfidCommandInfo);
-    Map<String, CommandParameter> doorLocksetUserTypeCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setRfid", doorLocksetRfidCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetUserTypeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetUserTypeCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
-    CommandParameterInfo doorLocksetUserTypeuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLocksetUserTypeCommandParams.put("userId", doorLocksetUserTypeuserIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLocksetUserTypeuserTypeCommandParameter =
-        new CommandParameter("userType", int.class);
-<<<<<<< HEAD
-    doorLock_setUserType_commandParams.put(
-        "userType", doorLock_setUserType_userType_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLocksetUserTypeCommandParams.put("userType", doorLocksetUserTypeuserTypeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocksetUserTypeuserTypeCommandParameterInfo =
-        new CommandParameterInfo("userType", int.class);
-    doorLocksetUserTypeCommandParams.put(
-        "userType", doorLocksetUserTypeuserTypeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetUserTypeCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setUserType(
-                      (ChipClusters.DoorLockCluster.SetUserTypeResponseCallback) callback,
-                      (Integer) commandArguments.get("userId"),
-                      (Integer) commandArguments.get("userType"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setUserType_commandParams);
-    doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setWeekdaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setWeekdaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_scheduleId_commandParameter);
-
-    CommandParameter setWeekdaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_userId_commandParameter);
-
-    CommandParameter setWeekdaySchedule_daysMask_commandParameter =
-        new CommandParameter("daysMask", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_daysMask_commandParameter);
-
-    CommandParameter setWeekdaySchedule_startHour_commandParameter =
-        new CommandParameter("startHour", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_startHour_commandParameter);
-
-    CommandParameter setWeekdaySchedule_startMinute_commandParameter =
-        new CommandParameter("startMinute", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_startMinute_commandParameter);
-
-    CommandParameter setWeekdaySchedule_endHour_commandParameter =
-        new CommandParameter("endHour", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_endHour_commandParameter);
-
-    CommandParameter setWeekdaySchedule_endMinute_commandParameter =
-        new CommandParameter("endMinute", int.class);
-    doorLock_setWeekdaySchedule_commandParams.add(setWeekdaySchedule_endMinute_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setWeekdaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetUserTypeResponseCallback(),
-            doorLocksetUserTypeCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setUserType", doorLocksetUserTypeCommandInfo);
-    Map<String, CommandParameter> doorLocksetWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setUserType", doorLocksetUserTypeCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetWeekdayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetWeekdayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
-    CommandParameterInfo doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "scheduleId", doorLocksetWeekdaySchedulescheduleIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekdayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "userId", doorLocksetWeekdayScheduleuserIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekdayScheduledaysMaskCommandParameterInfo =
-        new CommandParameterInfo("daysMask", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "daysMask", doorLocksetWeekdayScheduledaysMaskCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekdaySchedulestartHourCommandParameterInfo =
-        new CommandParameterInfo("startHour", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "startHour", doorLocksetWeekdaySchedulestartHourCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo =
-        new CommandParameterInfo("startMinute", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "startMinute", doorLocksetWeekdaySchedulestartMinuteCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetWeekdayScheduleendHourCommandParameterInfo =
-        new CommandParameterInfo("endHour", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "endHour", doorLocksetWeekdayScheduleendHourCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLocksetWeekdayScheduleendMinuteCommandParameter =
-        new CommandParameter("endMinute", int.class);
-<<<<<<< HEAD
-    doorLock_setWeekdaySchedule_commandParams.put(
-        "endMinute", doorLock_setWeekdaySchedule_endMinute_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocksetWeekdayScheduleendMinuteCommandParameterInfo =
-        new CommandParameterInfo("endMinute", int.class);
-    doorLocksetWeekdayScheduleCommandParams.put(
-        "endMinute", doorLocksetWeekdayScheduleendMinuteCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetWeekdayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setWeekdaySchedule(
-                      (ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"),
-                      (Integer) commandArguments.get("daysMask"),
-                      (Integer) commandArguments.get("startHour"),
-                      (Integer) commandArguments.get("startMinute"),
-                      (Integer) commandArguments.get("endHour"),
-                      (Integer) commandArguments.get("endMinute"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setWeekdaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_setYeardaySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setYeardaySchedule_scheduleId_commandParameter =
-        new CommandParameter("scheduleId", int.class);
-    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_scheduleId_commandParameter);
-
-    CommandParameter setYeardaySchedule_userId_commandParameter =
-        new CommandParameter("userId", int.class);
-    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_userId_commandParameter);
-
-    CommandParameter setYeardaySchedule_localStartTime_commandParameter =
-        new CommandParameter("localStartTime", long.class);
-    doorLock_setYeardaySchedule_commandParams.add(
-        setYeardaySchedule_localStartTime_commandParameter);
-
-    CommandParameter setYeardaySchedule_localEndTime_commandParameter =
-        new CommandParameter("localEndTime", long.class);
-    doorLock_setYeardaySchedule_commandParams.add(setYeardaySchedule_localEndTime_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_setYeardaySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetWeekdayScheduleResponseCallback(),
-            doorLocksetWeekdayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLocksetYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLocksetYeardayScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLocksetYeardayScheduleCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
-    CommandParameterInfo doorLocksetYeardaySchedulescheduleIdCommandParameterInfo =
-        new CommandParameterInfo("scheduleId", int.class);
-    doorLocksetYeardayScheduleCommandParams.put(
-        "scheduleId", doorLocksetYeardaySchedulescheduleIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetYeardayScheduleuserIdCommandParameterInfo =
-        new CommandParameterInfo("userId", int.class);
-    doorLocksetYeardayScheduleCommandParams.put(
-        "userId", doorLocksetYeardayScheduleuserIdCommandParameterInfo);
-
-    CommandParameterInfo doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo =
-        new CommandParameterInfo("localStartTime", long.class);
-    doorLocksetYeardayScheduleCommandParams.put(
-        "localStartTime", doorLocksetYeardaySchedulelocalStartTimeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLocksetYeardaySchedulelocalEndTimeCommandParameter =
-        new CommandParameter("localEndTime", long.class);
-<<<<<<< HEAD
-    doorLock_setYeardaySchedule_commandParams.put(
-        "localEndTime", doorLock_setYeardaySchedule_localEndTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLocksetYeardayScheduleCommandParams.put(
-        "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo =
-        new CommandParameterInfo("localEndTime", long.class);
-    doorLocksetYeardayScheduleCommandParams.put(
-        "localEndTime", doorLocksetYeardaySchedulelocalEndTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLocksetYeardayScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .setYeardaySchedule(
-                      (ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback) callback,
-                      (Integer) commandArguments.get("scheduleId"),
-                      (Integer) commandArguments.get("userId"),
-                      (Long) commandArguments.get("localStartTime"),
-                      (Long) commandArguments.get("localEndTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_setYeardaySchedule_commandParams);
-    doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_unlockDoor_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-    doorLock_unlockDoor_commandParams.add(unlockDoor_pin_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_unlockDoor_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedSetYeardayScheduleResponseCallback(),
-            doorLocksetYeardayScheduleCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
-    Map<String, CommandParameter> doorLockunlockDoorCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
-    Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockunlockDoorCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter doorLockunlockDoorpinCommandParameter =
-        new CommandParameter("pin", byte[].class);
-<<<<<<< HEAD
-    doorLock_unlockDoor_commandParams.put("pin", doorLock_unlockDoor_pin_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockunlockDoorpinCommandParameterInfo =
-        new CommandParameterInfo("pin", byte[].class);
-    doorLockunlockDoorCommandParams.put("pin", doorLockunlockDoorpinCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockunlockDoorCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .unlockDoor(
-                      (ChipClusters.DoorLockCluster.UnlockDoorResponseCallback) callback,
-                      (byte[]) commandArguments.get("pin"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            doorLock_unlockDoor_commandParams);
-    doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> doorLock_unlockWithTimeout_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter unlockWithTimeout_timeoutInSeconds_commandParameter =
-        new CommandParameter("timeoutInSeconds", int.class);
-    doorLock_unlockWithTimeout_commandParams.add(
-        unlockWithTimeout_timeoutInSeconds_commandParameter);
-
-    CommandParameter unlockWithTimeout_pin_commandParameter =
-        new CommandParameter("pin", byte[].class);
-    doorLock_unlockWithTimeout_commandParams.add(unlockWithTimeout_pin_commandParameter);
-=======
-    Map<String, CommandParameter> doorLock_unlockWithTimeout_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedUnlockDoorResponseCallback(),
-            doorLockunlockDoorCommandParams);
-<<<<<<< HEAD
-    doorLockClusterCommandInfo.put("unlockDoor", doorLockunlockDoorCommandInfo);
-    Map<String, CommandParameter> doorLockunlockWithTimeoutCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    doorLockClusterCommandInfoMap.put("unlockDoor", doorLockunlockDoorCommandInfo);
-    Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo doorLockunlockWithTimeoutCommandParameterInfo =
-        new CommandParameterInfo(
-            "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
-    CommandParameterInfo doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo =
-        new CommandParameterInfo("timeoutInSeconds", int.class);
-    doorLockunlockWithTimeoutCommandParams.put(
-        "timeoutInSeconds", doorLockunlockWithTimeouttimeoutInSecondsCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter doorLockunlockWithTimeoutpinCommandParameter =
-        new CommandParameter("pin", byte[].class);
-<<<<<<< HEAD
-    doorLock_unlockWithTimeout_commandParams.put(
-        "pin", doorLock_unlockWithTimeout_pin_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    doorLockunlockWithTimeoutCommandParams.put("pin", doorLockunlockWithTimeoutpinCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo doorLockunlockWithTimeoutpinCommandParameterInfo =
-        new CommandParameterInfo("pin", byte[].class);
-    doorLockunlockWithTimeoutCommandParams.put(
-        "pin", doorLockunlockWithTimeoutpinCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo doorLockunlockWithTimeoutCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.DoorLockCluster) cluster)
-                  .unlockWithTimeout(
-                      (ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback) callback,
-                      (Integer) commandArguments.get("timeoutInSeconds"),
-                      (byte[]) commandArguments.get("pin"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedUnlockWithTimeoutResponseCallback(),
-            doorLockunlockWithTimeoutCommandParams);
-    doorLockClusterCommandInfoMap.put("unlockWithTimeout", doorLockunlockWithTimeoutCommandInfo);
-    // Populate cluster
-    ClusterInfo doorLockClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId),
-            doorLockClusterCommandInfoMap);
-    clusterMap.put("doorLock", doorLockClusterInfo);
-    Map<String, CommandInfo> electricalMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo electricalMeasurementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            electricalMeasurement_ClusterCommandInfo);
-    clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
-    Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            electricalMeasurementClusterCommandInfo);
-    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
-    Map<String, CommandInfo> ethernetNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> ethernetNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            electricalMeasurementClusterCommandInfoMap);
-    clusterMap.put("electricalMeasurement", electricalMeasurementClusterInfo);
-    Map<String, CommandInfo> ethernetNetworkDiagnosticsClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo ethernetNetworkDiagnosticsresetCountsCommandParameterInfo =
-        new CommandParameterInfo(
-            "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo ethernetNetworkDiagnosticsresetCountsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            ethernetNetworkDiagnosticsresetCountsCommandParams);
-    ethernetNetworkDiagnosticsClusterCommandInfoMap.put(
-        "resetCounts", ethernetNetworkDiagnosticsresetCountsCommandInfo);
-    // Populate cluster
-    ClusterInfo ethernetNetworkDiagnosticsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId),
-            ethernetNetworkDiagnosticsClusterCommandInfoMap);
-    clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> fixedLabelClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo fixedLabelClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId),
-            fixedLabelClusterCommandInfoMap);
-    clusterMap.put("fixedLabel", fixedLabelClusterInfo);
-    Map<String, CommandInfo> flowMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo flowMeasurementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            flowMeasurement_ClusterCommandInfo);
-    clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
-    Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> generalCommissioning_armFailSafe_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter armFailSafe_expiryLengthSeconds_commandParameter =
-        new CommandParameter("expiryLengthSeconds", int.class);
-    generalCommissioning_armFailSafe_commandParams.add(
-        armFailSafe_expiryLengthSeconds_commandParameter);
-
-    CommandParameter armFailSafe_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_armFailSafe_commandParams.add(armFailSafe_breadcrumb_commandParameter);
-
-    CommandParameter armFailSafe_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    generalCommissioning_armFailSafe_commandParams.add(armFailSafe_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> generalCommissioning_armFailSafe_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            flowMeasurementClusterCommandInfo);
-    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
-    Map<String, CommandInfo> generalCommissioningClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> generalCommissioningarmFailSafeCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            flowMeasurementClusterCommandInfoMap);
-    clusterMap.put("flowMeasurement", flowMeasurementClusterInfo);
-    Map<String, CommandInfo> generalCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo generalCommissioningarmFailSafeCommandParameterInfo =
-        new CommandParameterInfo(
-            "GeneralCommissioning",
-            ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
-    CommandParameterInfo generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo =
-        new CommandParameterInfo("expiryLengthSeconds", int.class);
-    generalCommissioningarmFailSafeCommandParams.put(
-        "expiryLengthSeconds",
-        generalCommissioningarmFailSafeexpiryLengthSecondsCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningarmFailSafebreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    generalCommissioningarmFailSafeCommandParams.put(
-        "breadcrumb", generalCommissioningarmFailSafebreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter generalCommissioningarmFailSafetimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    generalCommissioning_armFailSafe_commandParams.put(
-        "timeoutMs", generalCommissioning_armFailSafe_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    generalCommissioningarmFailSafeCommandParams.put(
-        "timeoutMs", generalCommissioningarmFailSafetimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo generalCommissioningarmFailSafetimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    generalCommissioningarmFailSafeCommandParams.put(
-        "timeoutMs", generalCommissioningarmFailSafetimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo generalCommissioningarmFailSafeCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .armFailSafe(
-                      (ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("expiryLengthSeconds"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            generalCommissioning_armFailSafe_commandParams);
-    generalCommissioning_ClusterCommandInfo.put(
-        "armFailSafe", generalCommissioning_armFailSafe_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> generalCommissioning_commissioningComplete_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> generalCommissioning_commissioningComplete_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedArmFailSafeResponseCallback(),
-            generalCommissioningarmFailSafeCommandParams);
-    generalCommissioningClusterCommandInfoMap.put(
-        "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> generalCommissioningcommissioningCompleteCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo generalCommissioningcommissioningCompleteCommandParameterInfo =
-        new CommandParameterInfo(
-            "GeneralCommissioning",
-            ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo generalCommissioningcommissioningCompleteCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .commissioningComplete(
-                      (ChipClusters.GeneralCommissioningCluster
-                              .CommissioningCompleteResponseCallback)
-                          callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            generalCommissioning_commissioningComplete_commandParams);
-    generalCommissioning_ClusterCommandInfo.put(
-        "commissioningComplete", generalCommissioning_commissioningComplete_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setRegulatoryConfig_location_commandParameter =
-        new CommandParameter("location", int.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.add(
-        setRegulatoryConfig_location_commandParameter);
-
-    CommandParameter setRegulatoryConfig_countryCode_commandParameter =
-        new CommandParameter("countryCode", String.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.add(
-        setRegulatoryConfig_countryCode_commandParameter);
-
-    CommandParameter setRegulatoryConfig_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.add(
-        setRegulatoryConfig_breadcrumb_commandParameter);
-
-    CommandParameter setRegulatoryConfig_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    generalCommissioning_setRegulatoryConfig_commandParams.add(
-        setRegulatoryConfig_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedCommissioningCompleteResponseCallback(),
-            generalCommissioningcommissioningCompleteCommandParams);
-    generalCommissioningClusterCommandInfoMap.put(
-        "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> generalCommissioningsetRegulatoryConfigCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigCommandParameterInfo =
-        new CommandParameterInfo(
-            "GeneralCommissioning",
-            ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
-    CommandParameterInfo generalCommissioningsetRegulatoryConfiglocationCommandParameterInfo =
-        new CommandParameterInfo("location", int.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "location", generalCommissioningsetRegulatoryConfiglocationCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo =
-        new CommandParameterInfo("countryCode", String.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "countryCode", generalCommissioningsetRegulatoryConfigcountryCodeCommandParameterInfo);
-
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "breadcrumb", generalCommissioningsetRegulatoryConfigbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    generalCommissioning_setRegulatoryConfig_commandParams.put(
-        "timeoutMs", generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "timeoutMs", generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    generalCommissioningsetRegulatoryConfigCommandParams.put(
-        "timeoutMs", generalCommissioningsetRegulatoryConfigtimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo generalCommissioningsetRegulatoryConfigCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GeneralCommissioningCluster) cluster)
-                  .setRegulatoryConfig(
-                      (ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("location"),
-                      (String) commandArguments.get("countryCode"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedSetRegulatoryConfigResponseCallback(),
-            generalCommissioningsetRegulatoryConfigCommandParams);
-    generalCommissioningClusterCommandInfoMap.put(
-        "setRegulatoryConfig", generalCommissioningsetRegulatoryConfigCommandInfo);
-    // Populate cluster
-    ClusterInfo generalCommissioningClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId),
-            generalCommissioningClusterCommandInfoMap);
-    clusterMap.put("generalCommissioning", generalCommissioningClusterInfo);
-    Map<String, CommandInfo> generalDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo generalDiagnosticsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId),
-            generalDiagnosticsClusterCommandInfoMap);
-    clusterMap.put("generalDiagnostics", generalDiagnosticsClusterInfo);
-    Map<String, CommandInfo> groupKeyManagementClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo groupKeyManagementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            groupKeyManagement_ClusterCommandInfo);
-    clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
-    Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> groups_addGroup_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    groups_addGroup_commandParams.add(addGroup_groupId_commandParameter);
-
-    CommandParameter addGroup_groupName_commandParameter =
-        new CommandParameter("groupName", String.class);
-    groups_addGroup_commandParams.add(addGroup_groupName_commandParameter);
-=======
-    Map<String, CommandParameter> groups_addGroup_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            groupKeyManagementClusterCommandInfo);
-    clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
-    Map<String, CommandInfo> groupsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> groupsaddGroupCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            groupKeyManagementClusterCommandInfoMap);
-    clusterMap.put("groupKeyManagement", groupKeyManagementClusterInfo);
-    Map<String, CommandInfo> groupsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsaddGroupCommandParameterInfo =
-        new CommandParameterInfo(
-            "Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
-    CommandParameterInfo groupsaddGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    groupsaddGroupCommandParams.put("groupId", groupsaddGroupgroupIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter groupsaddGroupgroupNameCommandParameter =
-        new CommandParameter("groupName", String.class);
-<<<<<<< HEAD
-    groups_addGroup_commandParams.put("groupName", groups_addGroup_groupName_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo groupsaddGroupgroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
-    groupsaddGroupCommandParams.put("groupName", groupsaddGroupgroupNameCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo groupsaddGroupCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .addGroup(
-                      (ChipClusters.GroupsCluster.AddGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (String) commandArguments.get("groupName"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            groups_addGroup_commandParams);
-    groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> groups_addGroupIfIdentifying_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addGroupIfIdentifying_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    groups_addGroupIfIdentifying_commandParams.add(addGroupIfIdentifying_groupId_commandParameter);
-
-    CommandParameter addGroupIfIdentifying_groupName_commandParameter =
-        new CommandParameter("groupName", String.class);
-    groups_addGroupIfIdentifying_commandParams.add(
-        addGroupIfIdentifying_groupName_commandParameter);
-=======
-    Map<String, CommandParameter> groups_addGroupIfIdentifying_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedAddGroupResponseCallback(),
-            groupsaddGroupCommandParams);
-<<<<<<< HEAD
-    groupsClusterCommandInfo.put("addGroup", groupsaddGroupCommandInfo);
-    Map<String, CommandParameter> groupsaddGroupIfIdentifyingCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    groupsClusterCommandInfoMap.put("addGroup", groupsaddGroupCommandInfo);
-    Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsaddGroupIfIdentifyingCommandParameterInfo =
-        new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupId", groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter groupsaddGroupIfIdentifyinggroupNameCommandParameter =
-        new CommandParameter("groupName", String.class);
-<<<<<<< HEAD
-    groups_addGroupIfIdentifying_commandParams.put(
-        "groupName", groups_addGroupIfIdentifying_groupName_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo =
-        new CommandParameterInfo("groupName", String.class);
-    groupsaddGroupIfIdentifyingCommandParams.put(
-        "groupName", groupsaddGroupIfIdentifyinggroupNameCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo groupsaddGroupIfIdentifyingCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .addGroupIfIdentifying(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (String) commandArguments.get("groupName"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            groups_addGroupIfIdentifying_commandParams);
-    groups_ClusterCommandInfo.put(
-        "addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> groups_getGroupMembership_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getGroupMembership_groupCount_commandParameter =
-        new CommandParameter("groupCount", int.class);
-    groups_getGroupMembership_commandParams.add(getGroupMembership_groupCount_commandParameter);
-
-    CommandParameter getGroupMembership_groupList_commandParameter =
-        new CommandParameter("groupList", int.class);
-    groups_getGroupMembership_commandParams.add(getGroupMembership_groupList_commandParameter);
-=======
-    Map<String, CommandParameter> groups_getGroupMembership_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            groupsaddGroupIfIdentifyingCommandParams);
-<<<<<<< HEAD
-    groupsClusterCommandInfo.put("addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
-    Map<String, CommandParameter> groupsgetGroupMembershipCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    groupsClusterCommandInfoMap.put(
-        "addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
-    Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsgetGroupMembershipCommandParameterInfo =
-        new CommandParameterInfo(
-            "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
-    CommandParameterInfo groupsgetGroupMembershipgroupCountCommandParameterInfo =
-        new CommandParameterInfo("groupCount", int.class);
-    groupsgetGroupMembershipCommandParams.put(
-        "groupCount", groupsgetGroupMembershipgroupCountCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter groupsgetGroupMembershipgroupListCommandParameter =
-        new CommandParameter("groupList", int.class);
-<<<<<<< HEAD
-    groups_getGroupMembership_commandParams.put(
-        "groupList", groups_getGroupMembership_groupList_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsgetGroupMembershipCommandParams.put(
-        "groupList", groupsgetGroupMembershipgroupListCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo groupsgetGroupMembershipgroupListCommandParameterInfo =
-        new CommandParameterInfo("groupList", int.class);
-    groupsgetGroupMembershipCommandParams.put(
-        "groupList", groupsgetGroupMembershipgroupListCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo groupsgetGroupMembershipCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .getGroupMembership(
-                      (ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback,
-                      (Integer) commandArguments.get("groupCount"),
-                      (Integer) commandArguments.get("groupList"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            groups_getGroupMembership_commandParams);
-    groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> groups_removeAllGroups_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> groups_removeAllGroups_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetGroupMembershipResponseCallback(),
-            groupsgetGroupMembershipCommandParams);
-<<<<<<< HEAD
-    groupsClusterCommandInfo.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
-    Map<String, CommandParameter> groupsremoveAllGroupsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter groupsremoveAllGroupsCommandParameter =
-        new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsClusterCommandInfoMap.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
-    Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsremoveAllGroupsCommandParameterInfo =
-        new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo groupsremoveAllGroupsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .removeAllGroups((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            groups_removeAllGroups_commandParams);
-    groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> groups_removeGroup_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeGroup_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    groups_removeGroup_commandParams.add(removeGroup_groupId_commandParameter);
-=======
-    Map<String, CommandParameter> groups_removeGroup_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            groupsremoveAllGroupsCommandParams);
-<<<<<<< HEAD
-    groupsClusterCommandInfo.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
-    Map<String, CommandParameter> groupsremoveGroupCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    groupsClusterCommandInfoMap.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
-    Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsremoveGroupCommandParameterInfo =
-        new CommandParameterInfo(
-            "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter groupsremoveGroupgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-<<<<<<< HEAD
-    groups_removeGroup_commandParams.put("groupId", groups_removeGroup_groupId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo groupsremoveGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    groupsremoveGroupCommandParams.put("groupId", groupsremoveGroupgroupIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo groupsremoveGroupCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .removeGroup(
-                      (ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            groups_removeGroup_commandParams);
-    groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> groups_viewGroup_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter viewGroup_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    groups_viewGroup_commandParams.add(viewGroup_groupId_commandParameter);
-=======
-    Map<String, CommandParameter> groups_viewGroup_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedRemoveGroupResponseCallback(),
-            groupsremoveGroupCommandParams);
-<<<<<<< HEAD
-    groupsClusterCommandInfo.put("removeGroup", groupsremoveGroupCommandInfo);
-    Map<String, CommandParameter> groupsviewGroupCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter groupsviewGroupCommandParameter =
-        new CommandParameter("Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
-    CommandParameter groupsviewGroupgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-<<<<<<< HEAD
-    groups_viewGroup_commandParams.put("groupId", groups_viewGroup_groupId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    groupsClusterCommandInfoMap.put("removeGroup", groupsremoveGroupCommandInfo);
-    Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo groupsviewGroupCommandParameterInfo =
-        new CommandParameterInfo(
-            "Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
-    CommandParameterInfo groupsviewGroupgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    groupsviewGroupCommandParams.put("groupId", groupsviewGroupgroupIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo groupsviewGroupCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.GroupsCluster) cluster)
-                  .viewGroup(
-                      (ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedViewGroupResponseCallback(),
-            groupsviewGroupCommandParams);
-    groupsClusterCommandInfoMap.put("viewGroup", groupsviewGroupCommandInfo);
-    // Populate cluster
-    ClusterInfo groupsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            groups_ClusterCommandInfo);
-    clusterMap.put("groups", groups_clusterInfo);
-    Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> identify_identify_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter identify_identifyTime_commandParameter =
-        new CommandParameter("identifyTime", int.class);
-    identify_identify_commandParams.add(identify_identifyTime_commandParameter);
-=======
-    Map<String, CommandParameter> identify_identify_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            groupsClusterCommandInfo);
-    clusterMap.put("groups", groupsClusterInfo);
-    Map<String, CommandInfo> identifyClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> identifyidentifyCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter identifyidentifyCommandParameter =
-        new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter identifyidentifyidentifyTimeCommandParameter =
-        new CommandParameter("identifyTime", int.class);
-<<<<<<< HEAD
-    identify_identify_commandParams.put(
-        "identifyTime", identify_identify_identifyTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    identifyidentifyCommandParams.put("identifyTime", identifyidentifyidentifyTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            groupsClusterCommandInfoMap);
-    clusterMap.put("groups", groupsClusterInfo);
-    Map<String, CommandInfo> identifyClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> identifyidentifyCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo identifyidentifyCommandParameterInfo =
-        new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
-        new CommandParameterInfo("identifyTime", int.class);
-    identifyidentifyCommandParams.put(
-        "identifyTime", identifyidentifyidentifyTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo identifyidentifyCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .identify(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("identifyTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            identify_identify_commandParams);
-    identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> identify_identifyQuery_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> identify_identifyQuery_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            identifyidentifyCommandParams);
-<<<<<<< HEAD
-    identifyClusterCommandInfo.put("identify", identifyidentifyCommandInfo);
-    Map<String, CommandParameter> identifyidentifyQueryCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    identifyClusterCommandInfoMap.put("identify", identifyidentifyCommandInfo);
-    Map<String, CommandParameterInfo> identifyidentifyQueryCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo identifyidentifyQueryCommandParameterInfo =
-        new CommandParameterInfo(
-            "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo identifyidentifyQueryCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .identifyQuery(
-                      (ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            identify_identifyQuery_commandParams);
-    identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> identify_triggerEffect_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter triggerEffect_effectIdentifier_commandParameter =
-        new CommandParameter("effectIdentifier", int.class);
-    identify_triggerEffect_commandParams.add(triggerEffect_effectIdentifier_commandParameter);
-
-    CommandParameter triggerEffect_effectVariant_commandParameter =
-        new CommandParameter("effectVariant", int.class);
-    identify_triggerEffect_commandParams.add(triggerEffect_effectVariant_commandParameter);
-=======
-    Map<String, CommandParameter> identify_triggerEffect_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedIdentifyQueryResponseCallback(),
-            identifyidentifyQueryCommandParams);
-<<<<<<< HEAD
-    identifyClusterCommandInfo.put("identifyQuery", identifyidentifyQueryCommandInfo);
-    Map<String, CommandParameter> identifytriggerEffectCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    identifyClusterCommandInfoMap.put("identifyQuery", identifyidentifyQueryCommandInfo);
-    Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo identifytriggerEffectCommandParameterInfo =
-        new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
-        new CommandParameterInfo("effectIdentifier", int.class);
-    identifytriggerEffectCommandParams.put(
-        "effectIdentifier", identifytriggerEffecteffectIdentifierCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter identifytriggerEffecteffectVariantCommandParameter =
-        new CommandParameter("effectVariant", int.class);
-<<<<<<< HEAD
-    identify_triggerEffect_commandParams.put(
-        "effectVariant", identify_triggerEffect_effectVariant_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    identifytriggerEffectCommandParams.put(
-        "effectVariant", identifytriggerEffecteffectVariantCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo identifytriggerEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", int.class);
-    identifytriggerEffectCommandParams.put(
-        "effectVariant", identifytriggerEffecteffectVariantCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo identifytriggerEffectCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.IdentifyCluster) cluster)
-                  .triggerEffect(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("effectIdentifier"),
-                      (Integer) commandArguments.get("effectVariant"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            identifytriggerEffectCommandParams);
-    identifyClusterCommandInfoMap.put("triggerEffect", identifytriggerEffectCommandInfo);
-    // Populate cluster
-    ClusterInfo identifyClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            identify_ClusterCommandInfo);
-    clusterMap.put("identify", identify_clusterInfo);
-    Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> keypadInput_sendKey_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
-    keypadInput_sendKey_commandParams.add(sendKey_keyCode_commandParameter);
-=======
-    Map<String, CommandParameter> keypadInput_sendKey_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            identifyClusterCommandInfo);
-    clusterMap.put("identify", identifyClusterInfo);
-    Map<String, CommandInfo> keypadInputClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> keypadInputsendKeyCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            identifyClusterCommandInfoMap);
-    clusterMap.put("identify", identifyClusterInfo);
-    Map<String, CommandInfo> keypadInputClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo keypadInputsendKeyCommandParameterInfo =
-        new CommandParameterInfo(
-            "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter keypadInputsendKeykeyCodeCommandParameter =
-        new CommandParameter("keyCode", int.class);
-<<<<<<< HEAD
-    keypadInput_sendKey_commandParams.put("keyCode", keypadInput_sendKey_keyCode_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo keypadInputsendKeykeyCodeCommandParameterInfo =
-        new CommandParameterInfo("keyCode", int.class);
-    keypadInputsendKeyCommandParams.put("keyCode", keypadInputsendKeykeyCodeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo keypadInputsendKeyCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.KeypadInputCluster) cluster)
-                  .sendKey(
-                      (ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback,
-                      (Integer) commandArguments.get("keyCode"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedSendKeyResponseCallback(),
-            keypadInputsendKeyCommandParams);
-    keypadInputClusterCommandInfoMap.put("sendKey", keypadInputsendKeyCommandInfo);
-    // Populate cluster
-    ClusterInfo keypadInputClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            keypadInput_ClusterCommandInfo);
-    clusterMap.put("keypadInput", keypadInput_clusterInfo);
-    Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_move_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter move_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-    levelControl_move_commandParams.add(move_moveMode_commandParameter);
-
-    CommandParameter move_rate_commandParameter = new CommandParameter("rate", int.class);
-    levelControl_move_commandParams.add(move_rate_commandParameter);
-
-    CommandParameter move_optionMask_commandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControl_move_commandParams.add(move_optionMask_commandParameter);
-
-    CommandParameter move_optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    levelControl_move_commandParams.add(move_optionOverride_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_move_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            keypadInputClusterCommandInfo);
-    clusterMap.put("keypadInput", keypadInputClusterInfo);
-    Map<String, CommandInfo> levelControlClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> levelControlmoveCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            keypadInputClusterCommandInfoMap);
-    clusterMap.put("keypadInput", keypadInputClusterInfo);
-    Map<String, CommandInfo> levelControlClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> levelControlmoveCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlmoveCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    levelControlmoveCommandParams.put("moveMode", levelControlmovemoveModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoverateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    levelControlmoveCommandParams.put("rate", levelControlmoverateCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", int.class);
-    levelControlmoveCommandParams.put("optionMask", levelControlmoveoptionMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlmoveoptionOverrideCommandParameter =
-        new CommandParameter("optionOverride", int.class);
-<<<<<<< HEAD
-    levelControl_move_commandParams.put(
-        "optionOverride", levelControl_move_optionOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlmoveCommandParams.put(
-        "optionOverride", levelControlmoveoptionOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlmoveoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", int.class);
-    levelControlmoveCommandParams.put(
-        "optionOverride", levelControlmoveoptionOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlmoveCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .move(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_move_commandParams);
-    levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_moveToLevel_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToLevel_level_commandParameter = new CommandParameter("level", int.class);
-    levelControl_moveToLevel_commandParams.add(moveToLevel_level_commandParameter);
-
-    CommandParameter moveToLevel_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    levelControl_moveToLevel_commandParams.add(moveToLevel_transitionTime_commandParameter);
-
-    CommandParameter moveToLevel_optionMask_commandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControl_moveToLevel_commandParams.add(moveToLevel_optionMask_commandParameter);
-
-    CommandParameter moveToLevel_optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    levelControl_moveToLevel_commandParams.add(moveToLevel_optionOverride_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_moveToLevel_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlmoveCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("move", levelControlmoveCommandInfo);
-    Map<String, CommandParameter> levelControlmoveToLevelCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    levelControlClusterCommandInfoMap.put("move", levelControlmoveCommandInfo);
-    Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlmoveToLevelCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
-        new CommandParameterInfo("level", int.class);
-    levelControlmoveToLevelCommandParams.put(
-        "level", levelControlmoveToLevellevelCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveToLeveltransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    levelControlmoveToLevelCommandParams.put(
-        "transitionTime", levelControlmoveToLeveltransitionTimeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlmoveToLeveloptionOverrideCommandParameter =
-        new CommandParameter("optionOverride", int.class);
-<<<<<<< HEAD
-    levelControl_moveToLevel_commandParams.put(
-        "optionOverride", levelControl_moveToLevel_optionOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlmoveToLevelCommandParams.put(
-        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlmoveToLeveloptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", int.class);
-    levelControlmoveToLevelCommandParams.put(
-        "optionMask", levelControlmoveToLeveloptionMaskCommandParameterInfo);
-
-    CommandParameterInfo levelControlmoveToLeveloptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", int.class);
-    levelControlmoveToLevelCommandParams.put(
-        "optionOverride", levelControlmoveToLeveloptionOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlmoveToLevelCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveToLevel(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("level"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_moveToLevel_commandParams);
-    levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_moveToLevelWithOnOff_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveToLevelWithOnOff_level_commandParameter =
-        new CommandParameter("level", int.class);
-    levelControl_moveToLevelWithOnOff_commandParams.add(
-        moveToLevelWithOnOff_level_commandParameter);
-
-    CommandParameter moveToLevelWithOnOff_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    levelControl_moveToLevelWithOnOff_commandParams.add(
-        moveToLevelWithOnOff_transitionTime_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_moveToLevelWithOnOff_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlmoveToLevelCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("moveToLevel", levelControlmoveToLevelCommandInfo);
-    Map<String, CommandParameter> levelControlmoveToLevelWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    levelControlClusterCommandInfoMap.put("moveToLevel", levelControlmoveToLevelCommandInfo);
-    Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlmoveToLevelWithOnOffCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
-        new CommandParameterInfo("level", int.class);
-    levelControlmoveToLevelWithOnOffCommandParams.put(
-        "level", levelControlmoveToLevelWithOnOfflevelCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
-<<<<<<< HEAD
-    levelControl_moveToLevelWithOnOff_commandParams.put(
-        "transitionTime", levelControl_moveToLevelWithOnOff_transitionTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlmoveToLevelWithOnOffCommandParams.put(
-        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    levelControlmoveToLevelWithOnOffCommandParams.put(
-        "transitionTime", levelControlmoveToLevelWithOnOfftransitionTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlmoveToLevelWithOnOffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveToLevelWithOnOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("level"),
-                      (Integer) commandArguments.get("transitionTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_moveToLevelWithOnOff_commandParams);
-    levelControl_ClusterCommandInfo.put(
-        "moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_moveWithOnOff_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter moveWithOnOff_moveMode_commandParameter =
-        new CommandParameter("moveMode", int.class);
-    levelControl_moveWithOnOff_commandParams.add(moveWithOnOff_moveMode_commandParameter);
-
-    CommandParameter moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
-    levelControl_moveWithOnOff_commandParams.add(moveWithOnOff_rate_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_moveWithOnOff_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlmoveToLevelWithOnOffCommandParams);
-    levelControlClusterCommandInfoMap.put(
-        "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> levelControlmoveWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlmoveWithOnOffCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
-        new CommandParameterInfo("moveMode", int.class);
-    levelControlmoveWithOnOffCommandParams.put(
-        "moveMode", levelControlmoveWithOnOffmoveModeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlmoveWithOnOffrateCommandParameter =
-        new CommandParameter("rate", int.class);
-<<<<<<< HEAD
-    levelControl_moveWithOnOff_commandParams.put(
-        "rate", levelControl_moveWithOnOff_rate_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlmoveWithOnOffCommandParams.put(
-        "rate", levelControlmoveWithOnOffrateCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlmoveWithOnOffrateCommandParameterInfo =
-        new CommandParameterInfo("rate", int.class);
-    levelControlmoveWithOnOffCommandParams.put(
-        "rate", levelControlmoveWithOnOffrateCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlmoveWithOnOffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .moveWithOnOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("moveMode"),
-                      (Integer) commandArguments.get("rate"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_moveWithOnOff_commandParams);
-    levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_step_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter step_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-    levelControl_step_commandParams.add(step_stepMode_commandParameter);
-
-    CommandParameter step_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-    levelControl_step_commandParams.add(step_stepSize_commandParameter);
-
-    CommandParameter step_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    levelControl_step_commandParams.add(step_transitionTime_commandParameter);
-
-    CommandParameter step_optionMask_commandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControl_step_commandParams.add(step_optionMask_commandParameter);
-
-    CommandParameter step_optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    levelControl_step_commandParams.add(step_optionOverride_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_step_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlmoveWithOnOffCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
-    Map<String, CommandParameter> levelControlstepCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    levelControlClusterCommandInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
-    Map<String, CommandParameterInfo> levelControlstepCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlstepCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    levelControlstepCommandParams.put("stepMode", levelControlstepstepModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlstepstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    levelControlstepCommandParams.put("stepSize", levelControlstepstepSizeCommandParameterInfo);
-
-    CommandParameterInfo levelControlsteptransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    levelControlstepCommandParams.put(
-        "transitionTime", levelControlsteptransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo levelControlstepoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", int.class);
-    levelControlstepCommandParams.put("optionMask", levelControlstepoptionMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlstepoptionOverrideCommandParameter =
-        new CommandParameter("optionOverride", int.class);
-<<<<<<< HEAD
-    levelControl_step_commandParams.put(
-        "optionOverride", levelControl_step_optionOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlstepCommandParams.put(
-        "optionOverride", levelControlstepoptionOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlstepoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", int.class);
-    levelControlstepCommandParams.put(
-        "optionOverride", levelControlstepoptionOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlstepCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .step(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_step_commandParams);
-    levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_stepWithOnOff_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stepWithOnOff_stepMode_commandParameter =
-        new CommandParameter("stepMode", int.class);
-    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_stepMode_commandParameter);
-
-    CommandParameter stepWithOnOff_stepSize_commandParameter =
-        new CommandParameter("stepSize", int.class);
-    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_stepSize_commandParameter);
-
-    CommandParameter stepWithOnOff_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    levelControl_stepWithOnOff_commandParams.add(stepWithOnOff_transitionTime_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_stepWithOnOff_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlstepCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("step", levelControlstepCommandInfo);
-    Map<String, CommandParameter> levelControlstepWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    levelControlClusterCommandInfoMap.put("step", levelControlstepCommandInfo);
-    Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlstepWithOnOffCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
-        new CommandParameterInfo("stepMode", int.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "stepMode", levelControlstepWithOnOffstepModeCommandParameterInfo);
-
-    CommandParameterInfo levelControlstepWithOnOffstepSizeCommandParameterInfo =
-        new CommandParameterInfo("stepSize", int.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "stepSize", levelControlstepWithOnOffstepSizeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlstepWithOnOfftransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
-<<<<<<< HEAD
-    levelControl_stepWithOnOff_commandParams.put(
-        "transitionTime", levelControl_stepWithOnOff_transitionTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlstepWithOnOffCommandParams.put(
-        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlstepWithOnOfftransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    levelControlstepWithOnOffCommandParams.put(
-        "transitionTime", levelControlstepWithOnOfftransitionTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlstepWithOnOffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stepWithOnOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("stepMode"),
-                      (Integer) commandArguments.get("stepSize"),
-                      (Integer) commandArguments.get("transitionTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_stepWithOnOff_commandParams);
-    levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_stop_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter stop_optionMask_commandParameter =
-        new CommandParameter("optionMask", int.class);
-    levelControl_stop_commandParams.add(stop_optionMask_commandParameter);
-
-    CommandParameter stop_optionOverride_commandParameter =
-        new CommandParameter("optionOverride", int.class);
-    levelControl_stop_commandParams.add(stop_optionOverride_commandParameter);
-=======
-    Map<String, CommandParameter> levelControl_stop_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlstepWithOnOffCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
-    Map<String, CommandParameter> levelControlstopCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    levelControlClusterCommandInfoMap.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
-    Map<String, CommandParameterInfo> levelControlstopCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlstopCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
-        new CommandParameterInfo("optionMask", int.class);
-    levelControlstopCommandParams.put("optionMask", levelControlstopoptionMaskCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter levelControlstopoptionOverrideCommandParameter =
-        new CommandParameter("optionOverride", int.class);
-<<<<<<< HEAD
-    levelControl_stop_commandParams.put(
-        "optionOverride", levelControl_stop_optionOverride_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlstopCommandParams.put(
-        "optionOverride", levelControlstopoptionOverrideCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo levelControlstopoptionOverrideCommandParameterInfo =
-        new CommandParameterInfo("optionOverride", int.class);
-    levelControlstopCommandParams.put(
-        "optionOverride", levelControlstopoptionOverrideCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo levelControlstopCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stop(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("optionMask"),
-                      (Integer) commandArguments.get("optionOverride"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            levelControl_stop_commandParams);
-    levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> levelControl_stopWithOnOff_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> levelControl_stopWithOnOff_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlstopCommandParams);
-<<<<<<< HEAD
-    levelControlClusterCommandInfo.put("stop", levelControlstopCommandInfo);
-    Map<String, CommandParameter> levelControlstopWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter levelControlstopWithOnOffCommandParameter =
-        new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    levelControlClusterCommandInfoMap.put("stop", levelControlstopCommandInfo);
-    Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo levelControlstopWithOnOffCommandParameterInfo =
-        new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo levelControlstopWithOnOffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LevelControlCluster) cluster)
-                  .stopWithOnOff((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            levelControlstopWithOnOffCommandParams);
-    levelControlClusterCommandInfoMap.put("stopWithOnOff", levelControlstopWithOnOffCommandInfo);
-    // Populate cluster
-    ClusterInfo levelControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            levelControl_ClusterCommandInfo);
-    clusterMap.put("levelControl", levelControl_clusterInfo);
-    Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> lowPower_sleep_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> lowPower_sleep_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            levelControlClusterCommandInfo);
-    clusterMap.put("levelControl", levelControlClusterInfo);
-    Map<String, CommandInfo> lowPowerClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> lowPowersleepCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter lowPowersleepCommandParameter =
-        new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            levelControlClusterCommandInfoMap);
-    clusterMap.put("levelControl", levelControlClusterInfo);
-    Map<String, CommandInfo> lowPowerClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> lowPowersleepCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo lowPowersleepCommandParameterInfo =
-        new CommandParameterInfo("LowPower", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo lowPowersleepCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.LowPowerCluster) cluster).sleep((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            lowPowersleepCommandParams);
-    lowPowerClusterCommandInfoMap.put("sleep", lowPowersleepCommandInfo);
-    // Populate cluster
-    ClusterInfo lowPowerClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            lowPower_ClusterCommandInfo);
-    clusterMap.put("lowPower", lowPower_clusterInfo);
-    Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> mediaInput_hideInputStatus_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaInput_hideInputStatus_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            lowPowerClusterCommandInfo);
-    clusterMap.put("lowPower", lowPowerClusterInfo);
-    Map<String, CommandInfo> mediaInputClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> mediaInputhideInputStatusCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter mediaInputhideInputStatusCommandParameter =
-        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            lowPowerClusterCommandInfoMap);
-    clusterMap.put("lowPower", lowPowerClusterInfo);
-    Map<String, CommandInfo> mediaInputClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaInputhideInputStatusCommandParameterInfo =
-        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo mediaInputhideInputStatusCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .hideInputStatus((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            mediaInput_hideInputStatus_commandParams);
-    mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaInput_renameInput_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter renameInput_index_commandParameter = new CommandParameter("index", int.class);
-    mediaInput_renameInput_commandParams.add(renameInput_index_commandParameter);
-
-    CommandParameter renameInput_name_commandParameter = new CommandParameter("name", String.class);
-    mediaInput_renameInput_commandParams.add(renameInput_name_commandParameter);
-=======
-    Map<String, CommandParameter> mediaInput_renameInput_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            mediaInputhideInputStatusCommandParams);
-<<<<<<< HEAD
-    mediaInputClusterCommandInfo.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
-    Map<String, CommandParameter> mediaInputrenameInputCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaInputClusterCommandInfoMap.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
-    Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaInputrenameInputCommandParameterInfo =
-        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", int.class);
-    mediaInputrenameInputCommandParams.put("index", mediaInputrenameInputindexCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter mediaInputrenameInputnameCommandParameter =
-        new CommandParameter("name", String.class);
-<<<<<<< HEAD
-    mediaInput_renameInput_commandParams.put("name", mediaInput_renameInput_name_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo mediaInputrenameInputnameCommandParameterInfo =
-        new CommandParameterInfo("name", String.class);
-    mediaInputrenameInputCommandParams.put("name", mediaInputrenameInputnameCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo mediaInputrenameInputCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .renameInput(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("index"),
-                      (String) commandArguments.get("name"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            mediaInput_renameInput_commandParams);
-    mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaInput_selectInput_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter selectInput_index_commandParameter = new CommandParameter("index", int.class);
-    mediaInput_selectInput_commandParams.add(selectInput_index_commandParameter);
-=======
-    Map<String, CommandParameter> mediaInput_selectInput_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            mediaInputrenameInputCommandParams);
-<<<<<<< HEAD
-    mediaInputClusterCommandInfo.put("renameInput", mediaInputrenameInputCommandInfo);
-    Map<String, CommandParameter> mediaInputselectInputCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter mediaInputselectInputCommandParameter =
-        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter mediaInputselectInputindexCommandParameter =
-        new CommandParameter("index", int.class);
-<<<<<<< HEAD
-    mediaInput_selectInput_commandParams.put(
-        "index", mediaInput_selectInput_index_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaInputClusterCommandInfoMap.put("renameInput", mediaInputrenameInputCommandInfo);
-    Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaInputselectInputCommandParameterInfo =
-        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
-        new CommandParameterInfo("index", int.class);
-    mediaInputselectInputCommandParams.put("index", mediaInputselectInputindexCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo mediaInputselectInputCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .selectInput(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("index"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            mediaInput_selectInput_commandParams);
-    mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaInput_showInputStatus_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaInput_showInputStatus_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            mediaInputselectInputCommandParams);
-<<<<<<< HEAD
-    mediaInputClusterCommandInfo.put("selectInput", mediaInputselectInputCommandInfo);
-    Map<String, CommandParameter> mediaInputshowInputStatusCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter mediaInputshowInputStatusCommandParameter =
-        new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    mediaInputClusterCommandInfoMap.put("selectInput", mediaInputselectInputCommandInfo);
-    Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaInputshowInputStatusCommandParameterInfo =
-        new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo mediaInputshowInputStatusCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaInputCluster) cluster)
-                  .showInputStatus((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaInputshowInputStatusCommandParams);
-    mediaInputClusterCommandInfoMap.put("showInputStatus", mediaInputshowInputStatusCommandInfo);
-    // Populate cluster
-    ClusterInfo mediaInputClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            mediaInput_ClusterCommandInfo);
-    clusterMap.put("mediaInput", mediaInput_clusterInfo);
-    Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaFastForward_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaFastForward_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            mediaInputClusterCommandInfo);
-    clusterMap.put("mediaInput", mediaInputClusterInfo);
-    Map<String, CommandInfo> mediaPlaybackClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> mediaPlaybackmediaFastForwardCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            mediaInputClusterCommandInfoMap);
-    clusterMap.put("mediaInput", mediaInputClusterInfo);
-    Map<String, CommandInfo> mediaPlaybackClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> mediaPlaybackmediaFastForwardCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaFastForwardCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback",
-            ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaFastForwardCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaFastForward(
-                      (ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback)
-                          callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaFastForward_commandParams);
-    mediaPlayback_ClusterCommandInfo.put(
-        "mediaFastForward", mediaPlayback_mediaFastForward_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaNext_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaNext_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaFastForwardResponseCallback(),
-            mediaPlaybackmediaFastForwardCommandParams);
-    mediaPlaybackClusterCommandInfoMap.put(
-        "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> mediaPlaybackmediaNextCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> mediaPlaybackmediaNextCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaNextCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaNextCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaNext(
-                      (ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaNext_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaPause_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaPause_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaNextResponseCallback(),
-            mediaPlaybackmediaNextCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaPauseCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaPauseCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaPauseCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaPauseCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaPause(
-                      (ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaPause_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaPlay_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaPlay_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaPauseResponseCallback(),
-            mediaPlaybackmediaPauseCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaPlayCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaPlayCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaPlayCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaPlayCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaPlay(
-                      (ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaPlay_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaPrevious_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaPrevious_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaPlayResponseCallback(),
-            mediaPlaybackmediaPlayCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaPreviousCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaPreviousCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaPreviousCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaPreviousCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaPrevious(
-                      (ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaPrevious_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaRewind_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaRewind_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaPreviousResponseCallback(),
-            mediaPlaybackmediaPreviousCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaRewindCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaRewindCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaRewindCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaRewindCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaRewind(
-                      (ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaRewind_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaSeek_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter mediaSeek_position_commandParameter =
-        new CommandParameter("position", long.class);
-    mediaPlayback_mediaSeek_commandParams.add(mediaSeek_position_commandParameter);
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaSeek_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaRewindResponseCallback(),
-            mediaPlaybackmediaRewindCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaSeekCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaSeekCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaSeekCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter mediaPlaybackmediaSeekpositionCommandParameter =
-        new CommandParameter("position", long.class);
-<<<<<<< HEAD
-    mediaPlayback_mediaSeek_commandParams.put(
-        "position", mediaPlayback_mediaSeek_position_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    mediaPlaybackmediaSeekCommandParams.put(
-        "position", mediaPlaybackmediaSeekpositionCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo mediaPlaybackmediaSeekpositionCommandParameterInfo =
-        new CommandParameterInfo("position", long.class);
-    mediaPlaybackmediaSeekCommandParams.put(
-        "position", mediaPlaybackmediaSeekpositionCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo mediaPlaybackmediaSeekCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaSeek(
-                      (ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback) callback,
-                      (Long) commandArguments.get("position"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaSeek_commandParams);
-    mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaSkipBackward_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter mediaSkipBackward_deltaPositionMilliseconds_commandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipBackward_commandParams.add(
-        mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaSkipBackward_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaSeekResponseCallback(),
-            mediaPlaybackmediaSeekCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaSkipBackwardCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaSkipBackwardCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaSkipBackwardCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback",
-            ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
-    CommandParameterInfo
-        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo =
-            new CommandParameterInfo("deltaPositionMilliseconds", long.class);
-    mediaPlaybackmediaSkipBackwardCommandParams.put(
-        "deltaPositionMilliseconds",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        mediaPlaybackmediaSkipBackwarddeltaPositionMillisecondsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo mediaPlaybackmediaSkipBackwardCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaSkipBackward(
-                      (ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback)
-                          callback,
-                      (Long) commandArguments.get("deltaPositionMilliseconds"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaSkipBackward_commandParams);
-    mediaPlayback_ClusterCommandInfo.put(
-        "mediaSkipBackward", mediaPlayback_mediaSkipBackward_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaSkipForward_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter mediaSkipForward_deltaPositionMilliseconds_commandParameter =
-        new CommandParameter("deltaPositionMilliseconds", long.class);
-    mediaPlayback_mediaSkipForward_commandParams.add(
-        mediaSkipForward_deltaPositionMilliseconds_commandParameter);
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaSkipForward_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaSkipBackwardResponseCallback(),
-            mediaPlaybackmediaSkipBackwardCommandParams);
-    mediaPlaybackClusterCommandInfoMap.put(
-        "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> mediaPlaybackmediaSkipForwardCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> mediaPlaybackmediaSkipForwardCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaSkipForwardCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback",
-            ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
-    CommandParameterInfo
-        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo =
-            new CommandParameterInfo("deltaPositionMilliseconds", long.class);
-    mediaPlaybackmediaSkipForwardCommandParams.put(
-        "deltaPositionMilliseconds",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        mediaPlaybackmediaSkipForwarddeltaPositionMillisecondsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo mediaPlaybackmediaSkipForwardCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaSkipForward(
-                      (ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback) callback,
-                      (Long) commandArguments.get("deltaPositionMilliseconds"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaSkipForward_commandParams);
-    mediaPlayback_ClusterCommandInfo.put(
-        "mediaSkipForward", mediaPlayback_mediaSkipForward_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaStartOver_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaStartOver_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaSkipForwardResponseCallback(),
-            mediaPlaybackmediaSkipForwardCommandParams);
-    mediaPlaybackClusterCommandInfoMap.put(
-        "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> mediaPlaybackmediaStartOverCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> mediaPlaybackmediaStartOverCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaStartOverCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback",
-            ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaStartOverCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaStartOver(
-                      (ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            mediaPlayback_mediaStartOver_commandParams);
-    mediaPlayback_ClusterCommandInfo.put(
-        "mediaStartOver", mediaPlayback_mediaStartOver_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> mediaPlayback_mediaStop_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> mediaPlayback_mediaStop_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedMediaStartOverResponseCallback(),
-            mediaPlaybackmediaStartOverCommandParams);
-<<<<<<< HEAD
-    mediaPlaybackClusterCommandInfo.put("mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
-    Map<String, CommandParameter> mediaPlaybackmediaStopCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    mediaPlaybackClusterCommandInfoMap.put(
-        "mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
-    Map<String, CommandParameterInfo> mediaPlaybackmediaStopCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo mediaPlaybackmediaStopCommandParameterInfo =
-        new CommandParameterInfo(
-            "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo mediaPlaybackmediaStopCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.MediaPlaybackCluster) cluster)
-                  .mediaStop(
-                      (ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedMediaStopResponseCallback(),
-            mediaPlaybackmediaStopCommandParams);
-    mediaPlaybackClusterCommandInfoMap.put("mediaStop", mediaPlaybackmediaStopCommandInfo);
-    // Populate cluster
-    ClusterInfo mediaPlaybackClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            mediaPlayback_ClusterCommandInfo);
-    clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
-    Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_addThreadNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addThreadNetwork_operationalDataset_commandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_addThreadNetwork_commandParams.add(
-        addThreadNetwork_operationalDataset_commandParameter);
-
-    CommandParameter addThreadNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addThreadNetwork_commandParams.add(
-        addThreadNetwork_breadcrumb_commandParameter);
-
-    CommandParameter addThreadNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_addThreadNetwork_commandParams.add(
-        addThreadNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_addThreadNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            mediaPlaybackClusterCommandInfo);
-    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
-    Map<String, CommandInfo> networkCommissioningClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> networkCommissioningaddThreadNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            mediaPlaybackClusterCommandInfoMap);
-    clusterMap.put("mediaPlayback", mediaPlaybackClusterInfo);
-    Map<String, CommandInfo> networkCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> networkCommissioningaddThreadNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningaddThreadNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
-    CommandParameterInfo
-        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameterInfo =
-            new CommandParameterInfo("operationalDataset", byte[].class);
-    networkCommissioningaddThreadNetworkCommandParams.put(
-        "operationalDataset",
-        networkCommissioningaddThreadNetworkoperationalDatasetCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningaddThreadNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningaddThreadNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddThreadNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningaddThreadNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_addThreadNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_addThreadNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningaddThreadNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningaddThreadNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningaddThreadNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningaddThreadNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningaddThreadNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningaddThreadNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .addThreadNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("operationalDataset"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_addThreadNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "addThreadNetwork", networkCommissioning_addThreadNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_addWiFiNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addWiFiNetwork_ssid_commandParameter =
-        new CommandParameter("ssid", byte[].class);
-    networkCommissioning_addWiFiNetwork_commandParams.add(addWiFiNetwork_ssid_commandParameter);
-
-    CommandParameter addWiFiNetwork_credentials_commandParameter =
-        new CommandParameter("credentials", byte[].class);
-    networkCommissioning_addWiFiNetwork_commandParams.add(
-        addWiFiNetwork_credentials_commandParameter);
-
-    CommandParameter addWiFiNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_addWiFiNetwork_commandParams.add(
-        addWiFiNetwork_breadcrumb_commandParameter);
-
-    CommandParameter addWiFiNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_addWiFiNetwork_commandParams.add(
-        addWiFiNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_addWiFiNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedAddThreadNetworkResponseCallback(),
-            networkCommissioningaddThreadNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningaddWiFiNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningaddWiFiNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningaddWiFiNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
-    CommandParameterInfo networkCommissioningaddWiFiNetworkssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class);
-    networkCommissioningaddWiFiNetworkCommandParams.put(
-        "ssid", networkCommissioningaddWiFiNetworkssidCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningaddWiFiNetworkcredentialsCommandParameterInfo =
-        new CommandParameterInfo("credentials", byte[].class);
-    networkCommissioningaddWiFiNetworkCommandParams.put(
-        "credentials", networkCommissioningaddWiFiNetworkcredentialsCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningaddWiFiNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningaddWiFiNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningaddWiFiNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningaddWiFiNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_addWiFiNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningaddWiFiNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningaddWiFiNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningaddWiFiNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningaddWiFiNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningaddWiFiNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningaddWiFiNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .addWiFiNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("ssid"),
-                      (byte[]) commandArguments.get("credentials"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_addWiFiNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "addWiFiNetwork", networkCommissioning_addWiFiNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_disableNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter disableNetwork_networkID_commandParameter =
-        new CommandParameter("networkID", byte[].class);
-    networkCommissioning_disableNetwork_commandParams.add(
-        disableNetwork_networkID_commandParameter);
-
-    CommandParameter disableNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_disableNetwork_commandParams.add(
-        disableNetwork_breadcrumb_commandParameter);
-
-    CommandParameter disableNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_disableNetwork_commandParams.add(
-        disableNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_disableNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedAddWiFiNetworkResponseCallback(),
-            networkCommissioningaddWiFiNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningdisableNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningdisableNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningdisableNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
-    CommandParameterInfo networkCommissioningdisableNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
-    networkCommissioningdisableNetworkCommandParams.put(
-        "networkID", networkCommissioningdisableNetworknetworkIDCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningdisableNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningdisableNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningdisableNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningdisableNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_disableNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_disableNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningdisableNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningdisableNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningdisableNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningdisableNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningdisableNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningdisableNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .disableNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_disableNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "disableNetwork", networkCommissioning_disableNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_enableNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter enableNetwork_networkID_commandParameter =
-        new CommandParameter("networkID", byte[].class);
-    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_networkID_commandParameter);
-
-    CommandParameter enableNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_breadcrumb_commandParameter);
-
-    CommandParameter enableNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_enableNetwork_commandParams.add(enableNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_enableNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedDisableNetworkResponseCallback(),
-            networkCommissioningdisableNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningenableNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningenableNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningenableNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
-    CommandParameterInfo networkCommissioningenableNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
-    networkCommissioningenableNetworkCommandParams.put(
-        "networkID", networkCommissioningenableNetworknetworkIDCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningenableNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningenableNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningenableNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningenableNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_enableNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_enableNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningenableNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningenableNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningenableNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningenableNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningenableNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningenableNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .enableNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_enableNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "enableNetwork", networkCommissioning_enableNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getLastNetworkCommissioningResult_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_getLastNetworkCommissioningResult_commandParams.add(
-        getLastNetworkCommissioningResult_timeoutMs_commandParameter);
-=======
-=======
-            () -> new DelegatedEnableNetworkResponseCallback(),
-            networkCommissioningenableNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "enableNetwork", networkCommissioningenableNetworkCommandInfo);
-<<<<<<< HEAD
->>>>>>> 41b0956c1 (on/off commands working)
-    Map<String, CommandParameter>
-=======
-    Map<String, CommandParameterInfo>
->>>>>>> fde1d13c0 (fix comments)
-        networkCommissioninggetLastNetworkCommissioningResultCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioninggetLastNetworkCommissioningResultCommandParameterInfo =
-        new CommandParameterInfo("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameterInfo =
-            new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioninggetLastNetworkCommissioningResultCommandParams.put(
-        "timeoutMs",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        networkCommissioninggetLastNetworkCommissioningResulttimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioninggetLastNetworkCommissioningResultCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .getLastNetworkCommissioningResult(
-                      (DefaultClusterCallback) callback, (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioninggetLastNetworkCommissioningResultCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "getLastNetworkCommissioningResult",
-<<<<<<< HEAD
-        networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_removeNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeNetwork_networkID_commandParameter =
-        new CommandParameter("networkID", byte[].class);
-    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_networkID_commandParameter);
-
-    CommandParameter removeNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_breadcrumb_commandParameter);
-
-    CommandParameter removeNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_removeNetwork_commandParams.add(removeNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_removeNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-        networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningremoveNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningremoveNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
-    CommandParameterInfo networkCommissioningremoveNetworknetworkIDCommandParameterInfo =
-        new CommandParameterInfo("networkID", byte[].class);
-    networkCommissioningremoveNetworkCommandParams.put(
-        "networkID", networkCommissioningremoveNetworknetworkIDCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningremoveNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningremoveNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningremoveNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_removeNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_removeNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningremoveNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningremoveNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningremoveNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningremoveNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningremoveNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningremoveNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .removeNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("networkID"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_removeNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "removeNetwork", networkCommissioning_removeNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_scanNetworks_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter scanNetworks_ssid_commandParameter =
-        new CommandParameter("ssid", byte[].class);
-    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_ssid_commandParameter);
-
-    CommandParameter scanNetworks_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_breadcrumb_commandParameter);
-
-    CommandParameter scanNetworks_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_scanNetworks_commandParams.add(scanNetworks_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_scanNetworks_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedRemoveNetworkResponseCallback(),
-            networkCommissioningremoveNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningscanNetworksCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningscanNetworksCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
-    CommandParameterInfo networkCommissioningscanNetworksssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class);
-    networkCommissioningscanNetworksCommandParams.put(
-        "ssid", networkCommissioningscanNetworksssidCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningscanNetworksbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningscanNetworksCommandParams.put(
-        "breadcrumb", networkCommissioningscanNetworksbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningscanNetworkstimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_scanNetworks_commandParams.put(
-        "timeoutMs", networkCommissioning_scanNetworks_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningscanNetworksCommandParams.put(
-        "timeoutMs", networkCommissioningscanNetworkstimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningscanNetworkstimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningscanNetworksCommandParams.put(
-        "timeoutMs", networkCommissioningscanNetworkstimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningscanNetworksCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .scanNetworks(
-                      (ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("ssid"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_scanNetworks_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "scanNetworks", networkCommissioning_scanNetworks_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter updateThreadNetwork_operationalDataset_commandParameter =
-        new CommandParameter("operationalDataset", byte[].class);
-    networkCommissioning_updateThreadNetwork_commandParams.add(
-        updateThreadNetwork_operationalDataset_commandParameter);
-
-    CommandParameter updateThreadNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateThreadNetwork_commandParams.add(
-        updateThreadNetwork_breadcrumb_commandParameter);
-
-    CommandParameter updateThreadNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_updateThreadNetwork_commandParams.add(
-        updateThreadNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_updateThreadNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedScanNetworksResponseCallback(),
-            networkCommissioningscanNetworksCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "scanNetworks", networkCommissioningscanNetworksCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningupdateThreadNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningupdateThreadNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningupdateThreadNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
-    CommandParameterInfo
-        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameterInfo =
-            new CommandParameterInfo("operationalDataset", byte[].class);
-    networkCommissioningupdateThreadNetworkCommandParams.put(
-        "operationalDataset",
-        networkCommissioningupdateThreadNetworkoperationalDatasetCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningupdateThreadNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningupdateThreadNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningupdateThreadNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningupdateThreadNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_updateThreadNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningupdateThreadNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningupdateThreadNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningupdateThreadNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningupdateThreadNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningupdateThreadNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningupdateThreadNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .updateThreadNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("operationalDataset"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            networkCommissioning_updateThreadNetwork_commandParams);
-    networkCommissioning_ClusterCommandInfo.put(
-        "updateThreadNetwork", networkCommissioning_updateThreadNetwork_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter updateWiFiNetwork_ssid_commandParameter =
-        new CommandParameter("ssid", byte[].class);
-    networkCommissioning_updateWiFiNetwork_commandParams.add(
-        updateWiFiNetwork_ssid_commandParameter);
-
-    CommandParameter updateWiFiNetwork_credentials_commandParameter =
-        new CommandParameter("credentials", byte[].class);
-    networkCommissioning_updateWiFiNetwork_commandParams.add(
-        updateWiFiNetwork_credentials_commandParameter);
-
-    CommandParameter updateWiFiNetwork_breadcrumb_commandParameter =
-        new CommandParameter("breadcrumb", long.class);
-    networkCommissioning_updateWiFiNetwork_commandParams.add(
-        updateWiFiNetwork_breadcrumb_commandParameter);
-
-    CommandParameter updateWiFiNetwork_timeoutMs_commandParameter =
-        new CommandParameter("timeoutMs", long.class);
-    networkCommissioning_updateWiFiNetwork_commandParams.add(
-        updateWiFiNetwork_timeoutMs_commandParameter);
-=======
-    Map<String, CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedUpdateThreadNetworkResponseCallback(),
-            networkCommissioningupdateThreadNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> networkCommissioningupdateWiFiNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> networkCommissioningupdateWiFiNetworkCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo networkCommissioningupdateWiFiNetworkCommandParameterInfo =
-        new CommandParameterInfo(
-            "NetworkCommissioning",
-            ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
-    CommandParameterInfo networkCommissioningupdateWiFiNetworkssidCommandParameterInfo =
-        new CommandParameterInfo("ssid", byte[].class);
-    networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "ssid", networkCommissioningupdateWiFiNetworkssidCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningupdateWiFiNetworkcredentialsCommandParameterInfo =
-        new CommandParameterInfo("credentials", byte[].class);
-    networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "credentials", networkCommissioningupdateWiFiNetworkcredentialsCommandParameterInfo);
-
-    CommandParameterInfo networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameterInfo =
-        new CommandParameterInfo("breadcrumb", long.class);
-    networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "breadcrumb", networkCommissioningupdateWiFiNetworkbreadcrumbCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter =
-        new CommandParameter("timeoutMs", long.class);
-<<<<<<< HEAD
-    networkCommissioning_updateWiFiNetwork_commandParams.put(
-        "timeoutMs", networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningupdateWiFiNetworktimeoutMsCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo networkCommissioningupdateWiFiNetworktimeoutMsCommandParameterInfo =
-        new CommandParameterInfo("timeoutMs", long.class);
-    networkCommissioningupdateWiFiNetworkCommandParams.put(
-        "timeoutMs", networkCommissioningupdateWiFiNetworktimeoutMsCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo networkCommissioningupdateWiFiNetworkCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.NetworkCommissioningCluster) cluster)
-                  .updateWiFiNetwork(
-                      (ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("ssid"),
-                      (byte[]) commandArguments.get("credentials"),
-                      (Long) commandArguments.get("breadcrumb"),
-                      (Long) commandArguments.get("timeoutMs"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedUpdateWiFiNetworkResponseCallback(),
-            networkCommissioningupdateWiFiNetworkCommandParams);
-    networkCommissioningClusterCommandInfoMap.put(
-        "updateWiFiNetwork", networkCommissioningupdateWiFiNetworkCommandInfo);
-    // Populate cluster
-    ClusterInfo networkCommissioningClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            networkCommissioning_ClusterCommandInfo);
-    clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter applyUpdateRequest_updateToken_commandParameter =
-        new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.add(
-        applyUpdateRequest_updateToken_commandParameter);
-
-    CommandParameter applyUpdateRequest_newVersion_commandParameter =
-        new CommandParameter("newVersion", long.class);
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.add(
-        applyUpdateRequest_newVersion_commandParameter);
-=======
-    Map<String, CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            networkCommissioningClusterCommandInfo);
-    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            networkCommissioningClusterCommandInfoMap);
-    clusterMap.put("networkCommissioning", networkCommissioningClusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "OtaSoftwareUpdateProvider",
-            ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
-    CommandParameterInfo
-        otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
-    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "updateToken", otaSoftwareUpdateProviderapplyUpdateRequestupdateTokenCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter =
-        new CommandParameter("newVersion", long.class);
-<<<<<<< HEAD
-    otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put(
-        "newVersion", otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo =
-        new CommandParameterInfo("newVersion", long.class);
-    otaSoftwareUpdateProviderapplyUpdateRequestCommandParams.put(
-        "newVersion", otaSoftwareUpdateProviderapplyUpdateRequestnewVersionCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .applyUpdateRequest(
-                      (ChipClusters.OtaSoftwareUpdateProviderCluster
-                              .ApplyUpdateRequestResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("updateToken"),
-                      (Long) commandArguments.get("newVersion"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateProvider_applyUpdateRequest_commandParams);
-    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
-        "applyUpdateRequest", otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter notifyUpdateApplied_updateToken_commandParameter =
-        new CommandParameter("updateToken", byte[].class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.add(
-        notifyUpdateApplied_updateToken_commandParameter);
-
-    CommandParameter notifyUpdateApplied_softwareVersion_commandParameter =
-        new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.add(
-        notifyUpdateApplied_softwareVersion_commandParameter);
-=======
-    Map<String, CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedApplyUpdateRequestResponseCallback(),
-            otaSoftwareUpdateProviderapplyUpdateRequestCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
-        "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameterInfo =
-        new CommandParameterInfo(
-            "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo =
-            new CommandParameterInfo("updateToken", byte[].class);
-    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
-        "updateToken", otaSoftwareUpdateProvidernotifyUpdateAppliedupdateTokenCommandParameterInfo);
-
-    CommandParameterInfo
-        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo =
-            new CommandParameterInfo("softwareVersion", long.class);
-    otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams.put(
-        "softwareVersion",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        otaSoftwareUpdateProvidernotifyUpdateAppliedsoftwareVersionCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .notifyUpdateApplied(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("updateToken"),
-                      (Long) commandArguments.get("softwareVersion"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams);
-    otaSoftwareUpdateProvider_ClusterCommandInfo.put(
-        "notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter queryImage_vendorId_commandParameter =
-        new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_vendorId_commandParameter);
-
-    CommandParameter queryImage_productId_commandParameter =
-        new CommandParameter("productId", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_productId_commandParameter);
-
-    CommandParameter queryImage_hardwareVersion_commandParameter =
-        new CommandParameter("hardwareVersion", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(
-        queryImage_hardwareVersion_commandParameter);
-
-    CommandParameter queryImage_softwareVersion_commandParameter =
-        new CommandParameter("softwareVersion", long.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(
-        queryImage_softwareVersion_commandParameter);
-
-    CommandParameter queryImage_protocolsSupported_commandParameter =
-        new CommandParameter("protocolsSupported", int.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(
-        queryImage_protocolsSupported_commandParameter);
-
-    CommandParameter queryImage_location_commandParameter =
-        new CommandParameter("location", String.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(queryImage_location_commandParameter);
-
-    CommandParameter queryImage_requestorCanConsent_commandParameter =
-        new CommandParameter("requestorCanConsent", boolean.class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(
-        queryImage_requestorCanConsent_commandParameter);
-
-    CommandParameter queryImage_metadataForProvider_commandParameter =
-        new CommandParameter("metadataForProvider", byte[].class);
-    otaSoftwareUpdateProvider_queryImage_commandParams.add(
-        queryImage_metadataForProvider_commandParameter);
-=======
-    Map<String, CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
-        "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> otaSoftwareUpdateProviderqueryImageCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImageCommandParameterInfo =
-        new CommandParameterInfo(
-            "OtaSoftwareUpdateProvider",
-            ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", int.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "vendorId", otaSoftwareUpdateProviderqueryImagevendorIdCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo =
-        new CommandParameterInfo("productId", int.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "productId", otaSoftwareUpdateProviderqueryImageproductIdCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo =
-        new CommandParameterInfo("hardwareVersion", int.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "hardwareVersion", otaSoftwareUpdateProviderqueryImagehardwareVersionCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo =
-        new CommandParameterInfo("softwareVersion", long.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "softwareVersion", otaSoftwareUpdateProviderqueryImagesoftwareVersionCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo =
-        new CommandParameterInfo("protocolsSupported", int.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "protocolsSupported",
-        otaSoftwareUpdateProviderqueryImageprotocolsSupportedCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo =
-        new CommandParameterInfo("location", String.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "location", otaSoftwareUpdateProviderqueryImagelocationCommandParameterInfo);
-
-    CommandParameterInfo
-        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo =
-            new CommandParameterInfo("requestorCanConsent", boolean.class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "requestorCanConsent",
-        otaSoftwareUpdateProviderqueryImagerequestorCanConsentCommandParameterInfo);
-
-    CommandParameterInfo
-        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo =
-            new CommandParameterInfo("metadataForProvider", byte[].class);
-    otaSoftwareUpdateProviderqueryImageCommandParams.put(
-        "metadataForProvider",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        otaSoftwareUpdateProviderqueryImagemetadataForProviderCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo otaSoftwareUpdateProviderqueryImageCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                  .queryImage(
-                      (ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("vendorId"),
-                      (Integer) commandArguments.get("productId"),
-                      (Integer) commandArguments.get("hardwareVersion"),
-                      (Long) commandArguments.get("softwareVersion"),
-                      (Integer) commandArguments.get("protocolsSupported"),
-                      (String) commandArguments.get("location"),
-                      (Boolean) commandArguments.get("requestorCanConsent"),
-                      (byte[]) commandArguments.get("metadataForProvider"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedQueryImageResponseCallback(),
-            otaSoftwareUpdateProviderqueryImageCommandParams);
-    otaSoftwareUpdateProviderClusterCommandInfoMap.put(
-        "queryImage", otaSoftwareUpdateProviderqueryImageCommandInfo);
-    // Populate cluster
-    ClusterInfo otaSoftwareUpdateProviderClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            otaSoftwareUpdateProvider_ClusterCommandInfo);
-    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter announceOtaProvider_providerLocation_commandParameter =
-        new CommandParameter("providerLocation", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
-        announceOtaProvider_providerLocation_commandParameter);
-
-    CommandParameter announceOtaProvider_vendorId_commandParameter =
-        new CommandParameter("vendorId", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
-        announceOtaProvider_vendorId_commandParameter);
-
-    CommandParameter announceOtaProvider_announcementReason_commandParameter =
-        new CommandParameter("announcementReason", int.class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
-        announceOtaProvider_announcementReason_commandParameter);
-
-    CommandParameter announceOtaProvider_metadataForNode_commandParameter =
-        new CommandParameter("metadataForNode", byte[].class);
-    otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.add(
-        announceOtaProvider_metadataForNode_commandParameter);
-=======
-    Map<String, CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            otaSoftwareUpdateProviderClusterCommandInfo);
-    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateRequestorClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            otaSoftwareUpdateProviderClusterCommandInfoMap);
-    clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProviderClusterInfo);
-    Map<String, CommandInfo> otaSoftwareUpdateRequestorClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandParameterInfo =
-        new CommandParameterInfo(
-            "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameterInfo =
-            new CommandParameterInfo("providerLocation", byte[].class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "providerLocation",
-        otaSoftwareUpdateRequestorannounceOtaProviderproviderLocationCommandParameterInfo);
-
-    CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo =
-        new CommandParameterInfo("vendorId", int.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "vendorId", otaSoftwareUpdateRequestorannounceOtaProvidervendorIdCommandParameterInfo);
-
-    CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo =
-            new CommandParameterInfo("announcementReason", int.class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "announcementReason",
-        otaSoftwareUpdateRequestorannounceOtaProviderannouncementReasonCommandParameterInfo);
-
-    CommandParameterInfo
-        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo =
-            new CommandParameterInfo("metadataForNode", byte[].class);
-    otaSoftwareUpdateRequestorannounceOtaProviderCommandParams.put(
-        "metadataForNode",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        otaSoftwareUpdateRequestorannounceOtaProvidermetadataForNodeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                  .announceOtaProvider(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("providerLocation"),
-                      (Integer) commandArguments.get("vendorId"),
-                      (Integer) commandArguments.get("announcementReason"),
-                      (byte[]) commandArguments.get("metadataForNode"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            otaSoftwareUpdateRequestorannounceOtaProviderCommandParams);
-    otaSoftwareUpdateRequestorClusterCommandInfoMap.put(
-        "announceOtaProvider", otaSoftwareUpdateRequestorannounceOtaProviderCommandInfo);
-    // Populate cluster
-    ClusterInfo otaSoftwareUpdateRequestorClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId),
-            otaSoftwareUpdateRequestorClusterCommandInfoMap);
-    clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestorClusterInfo);
-    Map<String, CommandInfo> occupancySensingClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo occupancySensingClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            occupancySensing_ClusterCommandInfo);
-    clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
-    Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> onOff_off_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> onOff_off_commandParams = new HashMap<String, CommandParameter>();
-=======
-            occupancySensingClusterCommandInfo);
-    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
-    Map<String, CommandInfo> onOffClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> onOffoffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter onOffoffCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            occupancySensingClusterCommandInfoMap);
-    clusterMap.put("occupancySensing", occupancySensingClusterInfo);
-    Map<String, CommandInfo> onOffClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> onOffoffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo onOffoffCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo onOffoffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster).off((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            onOff_off_commandParams);
-    onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> onOff_offWithEffect_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter offWithEffect_effectId_commandParameter =
-        new CommandParameter("effectId", int.class);
-    onOff_offWithEffect_commandParams.add(offWithEffect_effectId_commandParameter);
-
-    CommandParameter offWithEffect_effectVariant_commandParameter =
-        new CommandParameter("effectVariant", int.class);
-    onOff_offWithEffect_commandParams.add(offWithEffect_effectVariant_commandParameter);
-=======
-    Map<String, CommandParameter> onOff_offWithEffect_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            onOffoffCommandParams);
-<<<<<<< HEAD
-    onOffClusterCommandInfo.put("off", onOffoffCommandInfo);
-    Map<String, CommandParameter> onOffoffWithEffectCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    onOffClusterCommandInfoMap.put("off", onOffoffCommandInfo);
-    Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo onOffoffWithEffectCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
-        new CommandParameterInfo("effectId", int.class);
-    onOffoffWithEffectCommandParams.put("effectId", onOffoffWithEffecteffectIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter onOffoffWithEffecteffectVariantCommandParameter =
-        new CommandParameter("effectVariant", int.class);
-<<<<<<< HEAD
-    onOff_offWithEffect_commandParams.put(
-        "effectVariant", onOff_offWithEffect_effectVariant_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    onOffoffWithEffectCommandParams.put(
-        "effectVariant", onOffoffWithEffecteffectVariantCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo onOffoffWithEffecteffectVariantCommandParameterInfo =
-        new CommandParameterInfo("effectVariant", int.class);
-    onOffoffWithEffectCommandParams.put(
-        "effectVariant", onOffoffWithEffecteffectVariantCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo onOffoffWithEffectCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster)
-                  .offWithEffect(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("effectId"),
-                      (Integer) commandArguments.get("effectVariant"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            onOff_offWithEffect_commandParams);
-    onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> onOff_on_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
-=======
-            onOffoffWithEffectCommandParams);
-<<<<<<< HEAD
-    onOffClusterCommandInfo.put("offWithEffect", onOffoffWithEffectCommandInfo);
-    Map<String, CommandParameter> onOffonCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter onOffonCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    onOffClusterCommandInfoMap.put("offWithEffect", onOffoffWithEffectCommandInfo);
-    Map<String, CommandParameterInfo> onOffonCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo onOffonCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo onOffonCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster).on((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            onOff_on_commandParams);
-    onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> onOff_onWithRecallGlobalScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> onOff_onWithRecallGlobalScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            onOffonCommandParams);
-<<<<<<< HEAD
-    onOffClusterCommandInfo.put("on", onOffonCommandInfo);
-    Map<String, CommandParameter> onOffonWithRecallGlobalSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter onOffonWithRecallGlobalSceneCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    onOffClusterCommandInfoMap.put("on", onOffonCommandInfo);
-    Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo onOffonWithRecallGlobalSceneCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo onOffonWithRecallGlobalSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster)
-                  .onWithRecallGlobalScene((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            onOff_onWithRecallGlobalScene_commandParams);
-    onOff_ClusterCommandInfo.put(
-        "onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> onOff_onWithTimedOff_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter onWithTimedOff_onOffControl_commandParameter =
-        new CommandParameter("onOffControl", int.class);
-    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_onOffControl_commandParameter);
-
-    CommandParameter onWithTimedOff_onTime_commandParameter =
-        new CommandParameter("onTime", int.class);
-    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_onTime_commandParameter);
-
-    CommandParameter onWithTimedOff_offWaitTime_commandParameter =
-        new CommandParameter("offWaitTime", int.class);
-    onOff_onWithTimedOff_commandParams.add(onWithTimedOff_offWaitTime_commandParameter);
-=======
-    Map<String, CommandParameter> onOff_onWithTimedOff_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            onOffonWithRecallGlobalSceneCommandParams);
-<<<<<<< HEAD
-    onOffClusterCommandInfo.put("onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
-    Map<String, CommandParameter> onOffonWithTimedOffCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    onOffClusterCommandInfoMap.put(
-        "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
-    Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo onOffonWithTimedOffCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
-        new CommandParameterInfo("onOffControl", int.class);
-    onOffonWithTimedOffCommandParams.put(
-        "onOffControl", onOffonWithTimedOffonOffControlCommandParameterInfo);
-
-    CommandParameterInfo onOffonWithTimedOffonTimeCommandParameterInfo =
-        new CommandParameterInfo("onTime", int.class);
-    onOffonWithTimedOffCommandParams.put("onTime", onOffonWithTimedOffonTimeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter onOffonWithTimedOffoffWaitTimeCommandParameter =
-        new CommandParameter("offWaitTime", int.class);
-<<<<<<< HEAD
-    onOff_onWithTimedOff_commandParams.put(
-        "offWaitTime", onOff_onWithTimedOff_offWaitTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    onOffonWithTimedOffCommandParams.put(
-        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo onOffonWithTimedOffoffWaitTimeCommandParameterInfo =
-        new CommandParameterInfo("offWaitTime", int.class);
-    onOffonWithTimedOffCommandParams.put(
-        "offWaitTime", onOffonWithTimedOffoffWaitTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo onOffonWithTimedOffCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster)
-                  .onWithTimedOff(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("onOffControl"),
-                      (Integer) commandArguments.get("onTime"),
-                      (Integer) commandArguments.get("offWaitTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            onOff_onWithTimedOff_commandParams);
-    onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> onOff_toggle_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> onOff_toggle_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            onOffonWithTimedOffCommandParams);
-<<<<<<< HEAD
-    onOffClusterCommandInfo.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
-    Map<String, CommandParameter> onOfftoggleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter onOfftoggleCommandParameter =
-        new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    onOffClusterCommandInfoMap.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
-    Map<String, CommandParameterInfo> onOfftoggleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo onOfftoggleCommandParameterInfo =
-        new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo onOfftoggleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OnOffCluster) cluster).toggle((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            onOfftoggleCommandParams);
-    onOffClusterCommandInfoMap.put("toggle", onOfftoggleCommandInfo);
-    // Populate cluster
-    ClusterInfo onOffClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId),
-            onOffClusterCommandInfoMap);
-    clusterMap.put("onOff", onOffClusterInfo);
-    Map<String, CommandInfo> onOffSwitchConfigurationClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo onOffSwitchConfigurationClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            onOffSwitchConfiguration_ClusterCommandInfo);
-    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
-    Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_addNOC_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addNOC_NOCValue_commandParameter =
-        new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.add(addNOC_NOCValue_commandParameter);
-
-    CommandParameter addNOC_ICACValue_commandParameter =
-        new CommandParameter("ICACValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.add(addNOC_ICACValue_commandParameter);
-
-    CommandParameter addNOC_IPKValue_commandParameter =
-        new CommandParameter("IPKValue", byte[].class);
-    operationalCredentials_addNOC_commandParams.add(addNOC_IPKValue_commandParameter);
-
-    CommandParameter addNOC_caseAdminNode_commandParameter =
-        new CommandParameter("caseAdminNode", long.class);
-    operationalCredentials_addNOC_commandParams.add(addNOC_caseAdminNode_commandParameter);
-
-    CommandParameter addNOC_adminVendorId_commandParameter =
-        new CommandParameter("adminVendorId", int.class);
-    operationalCredentials_addNOC_commandParams.add(addNOC_adminVendorId_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_addNOC_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            onOffSwitchConfigurationClusterCommandInfo);
-    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
-    Map<String, CommandInfo> operationalCredentialsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> operationalCredentialsaddNOCCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            onOffSwitchConfigurationClusterCommandInfoMap);
-    clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfigurationClusterInfo);
-    Map<String, CommandInfo> operationalCredentialsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsaddNOCCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameterInfo operationalCredentialsaddNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "NOCValue", operationalCredentialsaddNOCNOCValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "ICACValue", operationalCredentialsaddNOCICACValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCIPKValueCommandParameterInfo =
-        new CommandParameterInfo("IPKValue", byte[].class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "IPKValue", operationalCredentialsaddNOCIPKValueCommandParameterInfo);
-
-    CommandParameterInfo operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo =
-        new CommandParameterInfo("caseAdminNode", long.class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "caseAdminNode", operationalCredentialsaddNOCcaseAdminNodeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter operationalCredentialsaddNOCadminVendorIdCommandParameter =
-        new CommandParameter("adminVendorId", int.class);
-<<<<<<< HEAD
-    operationalCredentials_addNOC_commandParams.put(
-        "adminVendorId", operationalCredentials_addNOC_adminVendorId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    operationalCredentialsaddNOCCommandParams.put(
-        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo operationalCredentialsaddNOCadminVendorIdCommandParameterInfo =
-        new CommandParameterInfo("adminVendorId", int.class);
-    operationalCredentialsaddNOCCommandParams.put(
-        "adminVendorId", operationalCredentialsaddNOCadminVendorIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsaddNOCCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .addNOC(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (byte[]) commandArguments.get("NOCValue"),
-                      (byte[]) commandArguments.get("ICACValue"),
-                      (byte[]) commandArguments.get("IPKValue"),
-                      (Long) commandArguments.get("caseAdminNode"),
-                      (Integer) commandArguments.get("adminVendorId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_addNOC_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "addNOC", operationalCredentials_addNOC_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addTrustedRootCertificate_rootCertificate_commandParameter =
-        new CommandParameter("rootCertificate", byte[].class);
-    operationalCredentials_addTrustedRootCertificate_commandParams.add(
-        addTrustedRootCertificate_rootCertificate_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsaddNOCCommandParams);
-<<<<<<< HEAD
-    operationalCredentialsClusterCommandInfo.put("addNOC", operationalCredentialsaddNOCCommandInfo);
-    Map<String, CommandParameter> operationalCredentialsaddTrustedRootCertificateCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    operationalCredentialsClusterCommandInfoMap.put(
-        "addNOC", operationalCredentialsaddNOCCommandInfo);
-    Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsaddTrustedRootCertificateCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo =
-            new CommandParameterInfo("rootCertificate", byte[].class);
-    operationalCredentialsaddTrustedRootCertificateCommandParams.put(
-        "rootCertificate",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        operationalCredentialsaddTrustedRootCertificaterootCertificateCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsaddTrustedRootCertificateCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .addTrustedRootCertificate(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("rootCertificate"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            operationalCredentials_addTrustedRootCertificate_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_attestationRequest_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter attestationRequest_attestationNonce_commandParameter =
-        new CommandParameter("attestationNonce", byte[].class);
-    operationalCredentials_attestationRequest_commandParams.add(
-        attestationRequest_attestationNonce_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_attestationRequest_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            operationalCredentialsaddTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsattestationRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsattestationRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
-    CommandParameterInfo
-        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo =
-            new CommandParameterInfo("attestationNonce", byte[].class);
-    operationalCredentialsattestationRequestCommandParams.put(
-        "attestationNonce",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        operationalCredentials_attestationRequest_attestationNonce_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        operationalCredentialsattestationRequestattestationNonceCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        operationalCredentialsattestationRequestattestationNonceCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsattestationRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .attestationRequest(
-                      (ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback)
-                          callback,
-                      (byte[]) commandArguments.get("attestationNonce"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_attestationRequest_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "attestationRequest", operationalCredentials_attestationRequest_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter certificateChainRequest_certificateType_commandParameter =
-        new CommandParameter("certificateType", int.class);
-    operationalCredentials_certificateChainRequest_commandParams.add(
-        certificateChainRequest_certificateType_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_certificateChainRequest_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedAttestationResponseCallback(),
-            operationalCredentialsattestationRequestCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialscertificateChainRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialscertificateChainRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
-    CommandParameterInfo
-        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo =
-            new CommandParameterInfo("certificateType", int.class);
-    operationalCredentialscertificateChainRequestCommandParams.put(
-        "certificateType",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        operationalCredentials_certificateChainRequest_certificateType_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        operationalCredentialscertificateChainRequestcertificateTypeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        operationalCredentialscertificateChainRequestcertificateTypeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialscertificateChainRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .certificateChainRequest(
-                      (ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("certificateType"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_certificateChainRequest_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "certificateChainRequest", operationalCredentials_certificateChainRequest_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_opCSRRequest_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter opCSRRequest_CSRNonce_commandParameter =
-        new CommandParameter("CSRNonce", byte[].class);
-    operationalCredentials_opCSRRequest_commandParams.add(opCSRRequest_CSRNonce_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_opCSRRequest_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedCertificateChainResponseCallback(),
-            operationalCredentialscertificateChainRequestCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsopCSRRequestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialsopCSRRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsopCSRRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter operationalCredentialsopCSRRequestCSRNonceCommandParameter =
-        new CommandParameter("CSRNonce", byte[].class);
-<<<<<<< HEAD
-    operationalCredentials_opCSRRequest_commandParams.put(
-        "CSRNonce", operationalCredentials_opCSRRequest_CSRNonce_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    operationalCredentialsopCSRRequestCommandParams.put(
-        "CSRNonce", operationalCredentialsopCSRRequestCSRNonceCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo operationalCredentialsopCSRRequestCSRNonceCommandParameterInfo =
-        new CommandParameterInfo("CSRNonce", byte[].class);
-    operationalCredentialsopCSRRequestCommandParams.put(
-        "CSRNonce", operationalCredentialsopCSRRequestCSRNonceCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsopCSRRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .opCSRRequest(
-                      (ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback) callback,
-                      (byte[]) commandArguments.get("CSRNonce"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_opCSRRequest_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "opCSRRequest", operationalCredentials_opCSRRequest_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_removeFabric_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeFabric_fabricIndex_commandParameter =
-        new CommandParameter("fabricIndex", int.class);
-    operationalCredentials_removeFabric_commandParams.add(
-        removeFabric_fabricIndex_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_removeFabric_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedOpCSRResponseCallback(),
-            operationalCredentialsopCSRRequestCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsremoveFabricCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsremoveFabricCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter operationalCredentialsremoveFabricfabricIndexCommandParameter =
-        new CommandParameter("fabricIndex", int.class);
-<<<<<<< HEAD
-    operationalCredentials_removeFabric_commandParams.put(
-        "fabricIndex", operationalCredentials_removeFabric_fabricIndex_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    operationalCredentialsremoveFabricCommandParams.put(
-        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo operationalCredentialsremoveFabricfabricIndexCommandParameterInfo =
-        new CommandParameterInfo("fabricIndex", int.class);
-    operationalCredentialsremoveFabricCommandParams.put(
-        "fabricIndex", operationalCredentialsremoveFabricfabricIndexCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsremoveFabricCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .removeFabric(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (Integer) commandArguments.get("fabricIndex"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_removeFabric_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "removeFabric", operationalCredentials_removeFabric_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_removeTrustedRootCertificate_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeTrustedRootCertificate_trustedRootIdentifier_commandParameter =
-        new CommandParameter("trustedRootIdentifier", byte[].class);
-    operationalCredentials_removeTrustedRootCertificate_commandParams.add(
-        removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
-=======
-    Map<String, CommandParameter>
-        operationalCredentials_removeTrustedRootCertificate_commandParams =
-            new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsremoveFabricCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "removeFabric", operationalCredentialsremoveFabricCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsremoveTrustedRootCertificateCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo>
-        operationalCredentialsremoveTrustedRootCertificateCommandParams =
-            new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsremoveTrustedRootCertificateCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo =
-            new CommandParameterInfo("trustedRootIdentifier", byte[].class);
-    operationalCredentialsremoveTrustedRootCertificateCommandParams.put(
-        "trustedRootIdentifier",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        operationalCredentialsremoveTrustedRootCertificatetrustedRootIdentifierCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsremoveTrustedRootCertificateCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .removeTrustedRootCertificate(
-                      (DefaultClusterCallback) callback,
-                      (byte[]) commandArguments.get("trustedRootIdentifier"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentialsremoveTrustedRootCertificateCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "removeTrustedRootCertificate",
-<<<<<<< HEAD
-        operationalCredentials_removeTrustedRootCertificate_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
-        new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter updateFabricLabel_label_commandParameter =
-        new CommandParameter("label", String.class);
-    operationalCredentials_updateFabricLabel_commandParams.add(
-        updateFabricLabel_label_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_updateFabricLabel_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-        operationalCredentialsremoveTrustedRootCertificateCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsupdateFabricLabelCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsupdateFabricLabelCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter operationalCredentialsupdateFabricLabellabelCommandParameter =
-        new CommandParameter("label", String.class);
-<<<<<<< HEAD
-    operationalCredentials_updateFabricLabel_commandParams.put(
-        "label", operationalCredentials_updateFabricLabel_label_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    operationalCredentialsupdateFabricLabelCommandParams.put(
-        "label", operationalCredentialsupdateFabricLabellabelCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo operationalCredentialsupdateFabricLabellabelCommandParameterInfo =
-        new CommandParameterInfo("label", String.class);
-    operationalCredentialsupdateFabricLabelCommandParams.put(
-        "label", operationalCredentialsupdateFabricLabellabelCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsupdateFabricLabelCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .updateFabricLabel(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (String) commandArguments.get("label"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            operationalCredentials_updateFabricLabel_commandParams);
-    operationalCredentials_ClusterCommandInfo.put(
-        "updateFabricLabel", operationalCredentials_updateFabricLabel_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> operationalCredentials_updateNOC_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter updateNOC_NOCValue_commandParameter =
-        new CommandParameter("NOCValue", byte[].class);
-    operationalCredentials_updateNOC_commandParams.add(updateNOC_NOCValue_commandParameter);
-
-    CommandParameter updateNOC_ICACValue_commandParameter =
-        new CommandParameter("ICACValue", byte[].class);
-    operationalCredentials_updateNOC_commandParams.add(updateNOC_ICACValue_commandParameter);
-=======
-    Map<String, CommandParameter> operationalCredentials_updateNOC_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsupdateFabricLabelCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> operationalCredentialsupdateNOCCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo operationalCredentialsupdateNOCCommandParameterInfo =
-        new CommandParameterInfo(
-            "OperationalCredentials",
-            ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-    CommandParameterInfo operationalCredentialsupdateNOCNOCValueCommandParameterInfo =
-        new CommandParameterInfo("NOCValue", byte[].class);
-    operationalCredentialsupdateNOCCommandParams.put(
-        "NOCValue", operationalCredentialsupdateNOCNOCValueCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter operationalCredentialsupdateNOCICACValueCommandParameter =
-        new CommandParameter("ICACValue", byte[].class);
-<<<<<<< HEAD
-    operationalCredentials_updateNOC_commandParams.put(
-        "ICACValue", operationalCredentials_updateNOC_ICACValue_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    operationalCredentialsupdateNOCCommandParams.put(
-        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo operationalCredentialsupdateNOCICACValueCommandParameterInfo =
-        new CommandParameterInfo("ICACValue", byte[].class);
-    operationalCredentialsupdateNOCCommandParams.put(
-        "ICACValue", operationalCredentialsupdateNOCICACValueCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo operationalCredentialsupdateNOCCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.OperationalCredentialsCluster) cluster)
-                  .updateNOC(
-                      (ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback,
-                      (byte[]) commandArguments.get("NOCValue"),
-                      (byte[]) commandArguments.get("ICACValue"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedNOCResponseCallback(),
-            operationalCredentialsupdateNOCCommandParams);
-    operationalCredentialsClusterCommandInfoMap.put(
-        "updateNOC", operationalCredentialsupdateNOCCommandInfo);
-    // Populate cluster
-    ClusterInfo operationalCredentialsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId),
-            operationalCredentialsClusterCommandInfoMap);
-    clusterMap.put("operationalCredentials", operationalCredentialsClusterInfo);
-    Map<String, CommandInfo> powerSourceClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo powerSourceClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId),
-            powerSourceClusterCommandInfoMap);
-    clusterMap.put("powerSource", powerSourceClusterInfo);
-    Map<String, CommandInfo> pressureMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo pressureMeasurementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId),
-            pressureMeasurementClusterCommandInfoMap);
-    clusterMap.put("pressureMeasurement", pressureMeasurementClusterInfo);
-    Map<String, CommandInfo> pumpConfigurationAndControlClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo pumpConfigurationAndControlClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId),
-            pumpConfigurationAndControlClusterCommandInfoMap);
-    clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControlClusterInfo);
-    Map<String, CommandInfo> relativeHumidityMeasurementClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo relativeHumidityMeasurementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            relativeHumidityMeasurement_ClusterCommandInfo);
-    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
-    Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> scenes_addScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter addScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-    scenes_addScene_commandParams.add(addScene_groupId_commandParameter);
-
-    CommandParameter addScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-    scenes_addScene_commandParams.add(addScene_sceneId_commandParameter);
-
-    CommandParameter addScene_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    scenes_addScene_commandParams.add(addScene_transitionTime_commandParameter);
-
-    CommandParameter addScene_sceneName_commandParameter =
-        new CommandParameter("sceneName", String.class);
-    scenes_addScene_commandParams.add(addScene_sceneName_commandParameter);
-
-    CommandParameter addScene_clusterId_commandParameter =
-        new CommandParameter("clusterId", long.class);
-    scenes_addScene_commandParams.add(addScene_clusterId_commandParameter);
-
-    CommandParameter addScene_length_commandParameter = new CommandParameter("length", int.class);
-    scenes_addScene_commandParams.add(addScene_length_commandParameter);
-
-    CommandParameter addScene_value_commandParameter = new CommandParameter("value", int.class);
-    scenes_addScene_commandParams.add(addScene_value_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_addScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            relativeHumidityMeasurementClusterCommandInfo);
-    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
-    Map<String, CommandInfo> scenesClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> scenesaddSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            relativeHumidityMeasurementClusterCommandInfoMap);
-    clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurementClusterInfo);
-    Map<String, CommandInfo> scenesClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesaddSceneCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
-    CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", int.class);
-    scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    scenesaddSceneCommandParams.put(
-        "transitionTime", scenesaddScenetransitionTimeCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenesceneNameCommandParameterInfo =
-        new CommandParameterInfo("sceneName", String.class);
-    scenesaddSceneCommandParams.put("sceneName", scenesaddScenesceneNameCommandParameterInfo);
-
-    CommandParameterInfo scenesaddSceneclusterIdCommandParameterInfo =
-        new CommandParameterInfo("clusterId", long.class);
-    scenesaddSceneCommandParams.put("clusterId", scenesaddSceneclusterIdCommandParameterInfo);
-
-    CommandParameterInfo scenesaddScenelengthCommandParameterInfo =
-        new CommandParameterInfo("length", int.class);
-    scenesaddSceneCommandParams.put("length", scenesaddScenelengthCommandParameterInfo);
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-    CommandParameter scenes_addScene_value_commandParameter =
-        new CommandParameter("value", int.class);
-    scenes_addScene_commandParams.put("value", scenes_addScene_value_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    CommandParameter scenesaddScenevalueCommandParameter = new CommandParameter("value", int.class);
-    scenesaddSceneCommandParams.put("value", scenesaddScenevalueCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesaddScenevalueCommandParameterInfo =
-        new CommandParameterInfo("value", int.class);
-    scenesaddSceneCommandParams.put("value", scenesaddScenevalueCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesaddSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .addScene(
-                      (ChipClusters.ScenesCluster.AddSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"),
-                      (Integer) commandArguments.get("transitionTime"),
-                      (String) commandArguments.get("sceneName"),
-                      (Long) commandArguments.get("clusterId"),
-                      (Integer) commandArguments.get("length"),
-                      (Integer) commandArguments.get("value"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_addScene_commandParams);
-    scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_getSceneMembership_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getSceneMembership_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_getSceneMembership_commandParams.add(getSceneMembership_groupId_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_getSceneMembership_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedAddSceneResponseCallback(),
-            scenesaddSceneCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("addScene", scenesaddSceneCommandInfo);
-    Map<String, CommandParameter> scenesgetSceneMembershipCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("addScene", scenesaddSceneCommandInfo);
-    Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesgetSceneMembershipCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter scenesgetSceneMembershipgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-<<<<<<< HEAD
-    scenes_getSceneMembership_commandParams.put(
-        "groupId", scenes_getSceneMembership_groupId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesgetSceneMembershipCommandParams.put(
-        "groupId", scenesgetSceneMembershipgroupIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesgetSceneMembershipCommandParams.put(
-        "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesgetSceneMembershipCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .getSceneMembership(
-                      (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_getSceneMembership_commandParams);
-    scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_recallScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter recallScene_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_recallScene_commandParams.add(recallScene_groupId_commandParameter);
-
-    CommandParameter recallScene_sceneId_commandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenes_recallScene_commandParams.add(recallScene_sceneId_commandParameter);
-
-    CommandParameter recallScene_transitionTime_commandParameter =
-        new CommandParameter("transitionTime", int.class);
-    scenes_recallScene_commandParams.add(recallScene_transitionTime_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_recallScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedGetSceneMembershipResponseCallback(),
-            scenesgetSceneMembershipCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
-    Map<String, CommandParameter> scenesrecallSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
-    Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesrecallSceneCommandParameterInfo =
-        new CommandParameterInfo("Scenes", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo);
-
-    CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", int.class);
-    scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter scenesrecallScenetransitionTimeCommandParameter =
-        new CommandParameter("transitionTime", int.class);
-<<<<<<< HEAD
-    scenes_recallScene_commandParams.put(
-        "transitionTime", scenes_recallScene_transitionTime_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesrecallSceneCommandParams.put(
-        "transitionTime", scenesrecallScenetransitionTimeCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo =
-        new CommandParameterInfo("transitionTime", int.class);
-    scenesrecallSceneCommandParams.put(
-        "transitionTime", scenesrecallScenetransitionTimeCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesrecallSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .recallScene(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"),
-                      (Integer) commandArguments.get("transitionTime"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            scenes_recallScene_commandParams);
-    scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_removeAllScenes_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeAllScenes_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_removeAllScenes_commandParams.add(removeAllScenes_groupId_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_removeAllScenes_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            scenesrecallSceneCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("recallScene", scenesrecallSceneCommandInfo);
-    Map<String, CommandParameter> scenesremoveAllScenesCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("recallScene", scenesrecallSceneCommandInfo);
-    Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesremoveAllScenesCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter scenesremoveAllScenesgroupIdCommandParameter =
-        new CommandParameter("groupId", int.class);
-<<<<<<< HEAD
-    scenes_removeAllScenes_commandParams.put(
-        "groupId", scenes_removeAllScenes_groupId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesremoveAllScenesCommandParams.put("groupId", scenesremoveAllScenesgroupIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesremoveAllScenesCommandParams.put(
-        "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesremoveAllScenesCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .removeAllScenes(
-                      (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_removeAllScenes_commandParams);
-    scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_removeScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter removeScene_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_removeScene_commandParams.add(removeScene_groupId_commandParameter);
-
-    CommandParameter removeScene_sceneId_commandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenes_removeScene_commandParams.add(removeScene_sceneId_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_removeScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedRemoveAllScenesResponseCallback(),
-            scenesremoveAllScenesCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
-    Map<String, CommandParameter> scenesremoveSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
-    Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesremoveSceneCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
-    CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter scenesremoveScenesceneIdCommandParameter =
-        new CommandParameter("sceneId", int.class);
-<<<<<<< HEAD
-    scenes_removeScene_commandParams.put("sceneId", scenes_removeScene_sceneId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", int.class);
-    scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesremoveSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .removeScene(
-                      (ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_removeScene_commandParams);
-    scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_storeScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter storeScene_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_storeScene_commandParams.add(storeScene_groupId_commandParameter);
-
-    CommandParameter storeScene_sceneId_commandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenes_storeScene_commandParams.add(storeScene_sceneId_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_storeScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedRemoveSceneResponseCallback(),
-            scenesremoveSceneCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("removeScene", scenesremoveSceneCommandInfo);
-    Map<String, CommandParameter> scenesstoreSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("removeScene", scenesremoveSceneCommandInfo);
-    Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesstoreSceneCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
-    CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter scenesstoreScenesceneIdCommandParameter =
-        new CommandParameter("sceneId", int.class);
-<<<<<<< HEAD
-    scenes_storeScene_commandParams.put("sceneId", scenes_storeScene_sceneId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", int.class);
-    scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesstoreSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .storeScene(
-                      (ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            scenes_storeScene_commandParams);
-    scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> scenes_viewScene_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter viewScene_groupId_commandParameter =
-        new CommandParameter("groupId", int.class);
-    scenes_viewScene_commandParams.add(viewScene_groupId_commandParameter);
-
-    CommandParameter viewScene_sceneId_commandParameter =
-        new CommandParameter("sceneId", int.class);
-    scenes_viewScene_commandParams.add(viewScene_sceneId_commandParameter);
-=======
-    Map<String, CommandParameter> scenes_viewScene_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedStoreSceneResponseCallback(),
-            scenesstoreSceneCommandParams);
-<<<<<<< HEAD
-    scenesClusterCommandInfo.put("storeScene", scenesstoreSceneCommandInfo);
-    Map<String, CommandParameter> scenesviewSceneCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    scenesClusterCommandInfoMap.put("storeScene", scenesstoreSceneCommandInfo);
-    Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo scenesviewSceneCommandParameterInfo =
-        new CommandParameterInfo(
-            "Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
-    CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo =
-        new CommandParameterInfo("groupId", int.class);
-    scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter scenesviewScenesceneIdCommandParameter =
-        new CommandParameter("sceneId", int.class);
-<<<<<<< HEAD
-    scenes_viewScene_commandParams.put("sceneId", scenes_viewScene_sceneId_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo =
-        new CommandParameterInfo("sceneId", int.class);
-    scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo scenesviewSceneCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ScenesCluster) cluster)
-                  .viewScene(
-                      (ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback,
-                      (Integer) commandArguments.get("groupId"),
-                      (Integer) commandArguments.get("sceneId"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedViewSceneResponseCallback(),
-            scenesviewSceneCommandParams);
-    scenesClusterCommandInfoMap.put("viewScene", scenesviewSceneCommandInfo);
-    // Populate cluster
-    ClusterInfo scenesClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            scenes_ClusterCommandInfo);
-    clusterMap.put("scenes", scenes_clusterInfo);
-    Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> softwareDiagnostics_resetWatermarks_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> softwareDiagnostics_resetWatermarks_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            scenesClusterCommandInfo);
-    clusterMap.put("scenes", scenesClusterInfo);
-    Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> softwareDiagnosticsresetWatermarksCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter softwareDiagnosticsresetWatermarksCommandParameter =
-        new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            scenesClusterCommandInfoMap);
-    clusterMap.put("scenes", scenesClusterInfo);
-    Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo softwareDiagnosticsresetWatermarksCommandParameterInfo =
-        new CommandParameterInfo("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo softwareDiagnosticsresetWatermarksCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                  .resetWatermarks((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            softwareDiagnosticsresetWatermarksCommandParams);
-    softwareDiagnosticsClusterCommandInfoMap.put(
-        "resetWatermarks", softwareDiagnosticsresetWatermarksCommandInfo);
-    // Populate cluster
-    ClusterInfo softwareDiagnosticsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId),
-            softwareDiagnosticsClusterCommandInfoMap);
-    clusterMap.put("softwareDiagnostics", softwareDiagnosticsClusterInfo);
-    Map<String, CommandInfo> switchClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo switchClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            switch_ClusterCommandInfo);
-    clusterMap.put("switch", switch_clusterInfo);
-    Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> tvChannel_changeChannel_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter changeChannel_match_commandParameter =
-        new CommandParameter("match", String.class);
-    tvChannel_changeChannel_commandParams.add(changeChannel_match_commandParameter);
-=======
-    Map<String, CommandParameter> tvChannel_changeChannel_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            switchClusterCommandInfo);
-    clusterMap.put("switch", switchClusterInfo);
-    Map<String, CommandInfo> tvChannelClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> tvChannelchangeChannelCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            switchClusterCommandInfoMap);
-    clusterMap.put("switch", switchClusterInfo);
-    Map<String, CommandInfo> tvChannelClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> tvChannelchangeChannelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo tvChannelchangeChannelCommandParameterInfo =
-        new CommandParameterInfo(
-            "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
-<<<<<<< HEAD
-    CommandParameter tvChannelchangeChannelmatchCommandParameter =
-        new CommandParameter("match", String.class);
-<<<<<<< HEAD
-    tvChannel_changeChannel_commandParams.put(
-        "match", tvChannel_changeChannel_match_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    tvChannelchangeChannelCommandParams.put("match", tvChannelchangeChannelmatchCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo tvChannelchangeChannelmatchCommandParameterInfo =
-        new CommandParameterInfo("match", String.class);
-    tvChannelchangeChannelCommandParams.put(
-        "match", tvChannelchangeChannelmatchCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo tvChannelchangeChannelCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TvChannelCluster) cluster)
-                  .changeChannel(
-                      (ChipClusters.TvChannelCluster.ChangeChannelResponseCallback) callback,
-                      (String) commandArguments.get("match"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            tvChannel_changeChannel_commandParams);
-    tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> tvChannel_changeChannelByNumber_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter changeChannelByNumber_majorNumber_commandParameter =
-        new CommandParameter("majorNumber", int.class);
-    tvChannel_changeChannelByNumber_commandParams.add(
-        changeChannelByNumber_majorNumber_commandParameter);
-
-    CommandParameter changeChannelByNumber_minorNumber_commandParameter =
-        new CommandParameter("minorNumber", int.class);
-    tvChannel_changeChannelByNumber_commandParams.add(
-        changeChannelByNumber_minorNumber_commandParameter);
-=======
-    Map<String, CommandParameter> tvChannel_changeChannelByNumber_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedChangeChannelResponseCallback(),
-            tvChannelchangeChannelCommandParams);
-<<<<<<< HEAD
-    tvChannelClusterCommandInfo.put("changeChannel", tvChannelchangeChannelCommandInfo);
-    Map<String, CommandParameter> tvChannelchangeChannelByNumberCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    tvChannelClusterCommandInfoMap.put("changeChannel", tvChannelchangeChannelCommandInfo);
-    Map<String, CommandParameterInfo> tvChannelchangeChannelByNumberCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo tvChannelchangeChannelByNumberCommandParameterInfo =
-        new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo =
-        new CommandParameterInfo("majorNumber", int.class);
-    tvChannelchangeChannelByNumberCommandParams.put(
-        "majorNumber", tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter tvChannelchangeChannelByNumberminorNumberCommandParameter =
-        new CommandParameter("minorNumber", int.class);
-<<<<<<< HEAD
-    tvChannel_changeChannelByNumber_commandParams.put(
-        "minorNumber", tvChannel_changeChannelByNumber_minorNumber_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    tvChannelchangeChannelByNumberCommandParams.put(
-        "minorNumber", tvChannelchangeChannelByNumberminorNumberCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo tvChannelchangeChannelByNumberminorNumberCommandParameterInfo =
-        new CommandParameterInfo("minorNumber", int.class);
-    tvChannelchangeChannelByNumberCommandParams.put(
-        "minorNumber", tvChannelchangeChannelByNumberminorNumberCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo tvChannelchangeChannelByNumberCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TvChannelCluster) cluster)
-                  .changeChannelByNumber(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("majorNumber"),
-                      (Integer) commandArguments.get("minorNumber"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            tvChannel_changeChannelByNumber_commandParams);
-    tvChannel_ClusterCommandInfo.put(
-        "changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> tvChannel_skipChannel_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter skipChannel_count_commandParameter = new CommandParameter("count", int.class);
-    tvChannel_skipChannel_commandParams.add(skipChannel_count_commandParameter);
-=======
-    Map<String, CommandParameter> tvChannel_skipChannel_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            tvChannelchangeChannelByNumberCommandParams);
-    tvChannelClusterCommandInfoMap.put(
-        "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> tvChannelskipChannelCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter tvChannelskipChannelCommandParameter =
-        new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter tvChannelskipChannelcountCommandParameter =
-        new CommandParameter("count", int.class);
-<<<<<<< HEAD
-    tvChannel_skipChannel_commandParams.put("count", tvChannel_skipChannel_count_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    tvChannelskipChannelCommandParams.put("count", tvChannelskipChannelcountCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> tvChannelskipChannelCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo tvChannelskipChannelCommandParameterInfo =
-        new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo tvChannelskipChannelcountCommandParameterInfo =
-        new CommandParameterInfo("count", int.class);
-    tvChannelskipChannelCommandParams.put("count", tvChannelskipChannelcountCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo tvChannelskipChannelCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TvChannelCluster) cluster)
-                  .skipChannel(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("count"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            tvChannelskipChannelCommandParams);
-    tvChannelClusterCommandInfoMap.put("skipChannel", tvChannelskipChannelCommandInfo);
-    // Populate cluster
-    ClusterInfo tvChannelClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            tvChannel_ClusterCommandInfo);
-    clusterMap.put("tvChannel", tvChannel_clusterInfo);
-    Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> targetNavigator_navigateTarget_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter navigateTarget_target_commandParameter =
-        new CommandParameter("target", int.class);
-    targetNavigator_navigateTarget_commandParams.add(navigateTarget_target_commandParameter);
-
-    CommandParameter navigateTarget_data_commandParameter =
-        new CommandParameter("data", String.class);
-    targetNavigator_navigateTarget_commandParams.add(navigateTarget_data_commandParameter);
-=======
-    Map<String, CommandParameter> targetNavigator_navigateTarget_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            tvChannelClusterCommandInfo);
-    clusterMap.put("tvChannel", tvChannelClusterInfo);
-    Map<String, CommandInfo> targetNavigatorClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> targetNavigatornavigateTargetCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-            tvChannelClusterCommandInfoMap);
-    clusterMap.put("tvChannel", tvChannelClusterInfo);
-    Map<String, CommandInfo> targetNavigatorClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo targetNavigatornavigateTargetCommandParameterInfo =
-        new CommandParameterInfo(
-            "TargetNavigator",
-            ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
-    CommandParameterInfo targetNavigatornavigateTargettargetCommandParameterInfo =
-        new CommandParameterInfo("target", int.class);
-    targetNavigatornavigateTargetCommandParams.put(
-        "target", targetNavigatornavigateTargettargetCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter targetNavigatornavigateTargetdataCommandParameter =
-        new CommandParameter("data", String.class);
-<<<<<<< HEAD
-    targetNavigator_navigateTarget_commandParams.put(
-        "data", targetNavigator_navigateTarget_data_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    targetNavigatornavigateTargetCommandParams.put(
-        "data", targetNavigatornavigateTargetdataCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo targetNavigatornavigateTargetdataCommandParameterInfo =
-        new CommandParameterInfo("data", String.class);
-    targetNavigatornavigateTargetCommandParams.put(
-        "data", targetNavigatornavigateTargetdataCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo targetNavigatornavigateTargetCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TargetNavigatorCluster) cluster)
-                  .navigateTarget(
-                      (ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback,
-                      (Integer) commandArguments.get("target"),
-                      (String) commandArguments.get("data"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedNavigateTargetResponseCallback(),
-            targetNavigatornavigateTargetCommandParams);
-    targetNavigatorClusterCommandInfoMap.put(
-        "navigateTarget", targetNavigatornavigateTargetCommandInfo);
-    // Populate cluster
-    ClusterInfo targetNavigatorClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId),
-            targetNavigatorClusterCommandInfoMap);
-    clusterMap.put("targetNavigator", targetNavigatorClusterInfo);
-    Map<String, CommandInfo> temperatureMeasurementClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo temperatureMeasurementClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            temperatureMeasurement_ClusterCommandInfo);
-    clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
-    Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> testCluster_test_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> testCluster_test_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            temperatureMeasurementClusterCommandInfo);
-    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
-    Map<String, CommandInfo> testClusterClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> testClustertestCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter testClustertestCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            temperatureMeasurementClusterCommandInfoMap);
-    clusterMap.put("temperatureMeasurement", temperatureMeasurementClusterInfo);
-    Map<String, CommandInfo> testClusterClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> testClustertestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo testClustertestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TestClusterCluster) cluster).test((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            testCluster_test_commandParams);
-    testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> testCluster_testAddArguments_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter testAddArguments_arg1_commandParameter =
-        new CommandParameter("arg1", int.class);
-    testCluster_testAddArguments_commandParams.add(testAddArguments_arg1_commandParameter);
-
-    CommandParameter testAddArguments_arg2_commandParameter =
-        new CommandParameter("arg2", int.class);
-    testCluster_testAddArguments_commandParams.add(testAddArguments_arg2_commandParameter);
-=======
-    Map<String, CommandParameter> testCluster_testAddArguments_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            testClustertestCommandParams);
-<<<<<<< HEAD
-    testClusterClusterCommandInfo.put("test", testClustertestCommandInfo);
-    Map<String, CommandParameter> testClustertestAddArgumentsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    testClusterClusterCommandInfoMap.put("test", testClustertestCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestAddArgumentsCommandParameterInfo =
-        new CommandParameterInfo(
-            "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
-    CommandParameterInfo testClustertestAddArgumentsarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", int.class);
-    testClustertestAddArgumentsCommandParams.put(
-        "arg1", testClustertestAddArgumentsarg1CommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter testClustertestAddArgumentsarg2CommandParameter =
-        new CommandParameter("arg2", int.class);
-<<<<<<< HEAD
-    testCluster_testAddArguments_commandParams.put(
-        "arg2", testCluster_testAddArguments_arg2_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    testClustertestAddArgumentsCommandParams.put(
-        "arg2", testClustertestAddArgumentsarg2CommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo testClustertestAddArgumentsarg2CommandParameterInfo =
-        new CommandParameterInfo("arg2", int.class);
-    testClustertestAddArgumentsCommandParams.put(
-        "arg2", testClustertestAddArgumentsarg2CommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo testClustertestAddArgumentsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testAddArguments(
-                      (ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback,
-                      (Integer) commandArguments.get("arg1"),
-                      (Integer) commandArguments.get("arg2"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            testCluster_testAddArguments_commandParams);
-    testCluster_ClusterCommandInfo.put(
-        "testAddArguments", testCluster_testAddArguments_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> testCluster_testNotHandled_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> testCluster_testNotHandled_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedTestAddArgumentsResponseCallback(),
-            testClustertestAddArgumentsCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testAddArguments", testClustertestAddArgumentsCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestListInt8UArgumentRequestCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", int.class);
-    testClustertestListInt8UArgumentRequestCommandParams.put(
-        "arg1", testClustertestListInt8UArgumentRequestarg1CommandParameterInfo);
-
-    // Populate commands
-    CommandInfo testClustertestListInt8UArgumentRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListInt8UArgumentRequest(
-                      (DefaultClusterCallback) callback, (Integer) commandArguments.get("arg1"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestListInt8UArgumentRequestCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestListInt8UReverseRequestCommandParameterInfo =
-        new CommandParameterInfo(
-            "TestCluster",
-            ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback.class);
-    CommandParameterInfo testClustertestListInt8UReverseRequestarg1CommandParameterInfo =
-        new CommandParameterInfo("arg1", int.class);
-    testClustertestListInt8UReverseRequestCommandParams.put(
-        "arg1", testClustertestListInt8UReverseRequestarg1CommandParameterInfo);
-
-    // Populate commands
-    CommandInfo testClustertestListInt8UReverseRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListInt8UReverseRequest(
-                      (ChipClusters.TestClusterCluster.TestListInt8UReverseResponseCallback)
-                          callback,
-                      (Integer) commandArguments.get("arg1"));
-            },
-            () -> new DelegatedTestListInt8UReverseResponseCallback(),
-            testClustertestListInt8UReverseRequestCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestListStructArgumentRequestCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
-        new CommandParameterInfo("a", int.class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "a", testClustertestListStructArgumentRequestaCommandParameterInfo);
-
-    CommandParameterInfo testClustertestListStructArgumentRequestbCommandParameterInfo =
-        new CommandParameterInfo("b", boolean.class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "b", testClustertestListStructArgumentRequestbCommandParameterInfo);
-
-    CommandParameterInfo testClustertestListStructArgumentRequestcCommandParameterInfo =
-        new CommandParameterInfo("c", int.class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "c", testClustertestListStructArgumentRequestcCommandParameterInfo);
-
-    CommandParameterInfo testClustertestListStructArgumentRequestdCommandParameterInfo =
-        new CommandParameterInfo("d", byte[].class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "d", testClustertestListStructArgumentRequestdCommandParameterInfo);
-
-    CommandParameterInfo testClustertestListStructArgumentRequesteCommandParameterInfo =
-        new CommandParameterInfo("e", String.class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "e", testClustertestListStructArgumentRequesteCommandParameterInfo);
-
-    CommandParameterInfo testClustertestListStructArgumentRequestfCommandParameterInfo =
-        new CommandParameterInfo("f", int.class);
-    testClustertestListStructArgumentRequestCommandParams.put(
-        "f", testClustertestListStructArgumentRequestfCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo testClustertestListStructArgumentRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testListStructArgumentRequest(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("a"),
-                      (Boolean) commandArguments.get("b"),
-                      (Integer) commandArguments.get("c"),
-                      (byte[]) commandArguments.get("d"),
-                      (String) commandArguments.get("e"),
-                      (Integer) commandArguments.get("f"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestListStructArgumentRequestCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> testClustertestNotHandledCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter testClustertestNotHandledCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestNotHandledCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo testClustertestNotHandledCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testNotHandled((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            testCluster_testNotHandled_commandParams);
-    testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> testCluster_testSpecific_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> testCluster_testSpecific_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            testClustertestNotHandledCommandParams);
-<<<<<<< HEAD
-    testClusterClusterCommandInfo.put("testNotHandled", testClustertestNotHandledCommandInfo);
-    Map<String, CommandParameter> testClustertestSpecificCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    testClusterClusterCommandInfoMap.put("testNotHandled", testClustertestNotHandledCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestSpecificCommandParameterInfo =
-        new CommandParameterInfo(
-            "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo testClustertestSpecificCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testSpecific(
-                      (ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-<<<<<<< HEAD
-            () -> new DelegatedDefaultClusterCallback(),
-            testCluster_testSpecific_commandParams);
-    testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> testCluster_testUnknownCommand_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> testCluster_testUnknownCommand_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            () -> new DelegatedTestSpecificResponseCallback(),
-            testClustertestSpecificCommandParams);
-    testClusterClusterCommandInfoMap.put("testSpecific", testClustertestSpecificCommandInfo);
-    Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestStructArgumentRequestCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo testClustertestStructArgumentRequestaCommandParameterInfo =
-        new CommandParameterInfo("a", int.class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "a", testClustertestStructArgumentRequestaCommandParameterInfo);
-
-    CommandParameterInfo testClustertestStructArgumentRequestbCommandParameterInfo =
-        new CommandParameterInfo("b", boolean.class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "b", testClustertestStructArgumentRequestbCommandParameterInfo);
-
-    CommandParameterInfo testClustertestStructArgumentRequestcCommandParameterInfo =
-        new CommandParameterInfo("c", int.class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "c", testClustertestStructArgumentRequestcCommandParameterInfo);
-
-    CommandParameterInfo testClustertestStructArgumentRequestdCommandParameterInfo =
-        new CommandParameterInfo("d", byte[].class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "d", testClustertestStructArgumentRequestdCommandParameterInfo);
-
-    CommandParameterInfo testClustertestStructArgumentRequesteCommandParameterInfo =
-        new CommandParameterInfo("e", String.class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "e", testClustertestStructArgumentRequesteCommandParameterInfo);
-
-    CommandParameterInfo testClustertestStructArgumentRequestfCommandParameterInfo =
-        new CommandParameterInfo("f", int.class);
-    testClustertestStructArgumentRequestCommandParams.put(
-        "f", testClustertestStructArgumentRequestfCommandParameterInfo);
-
-    // Populate commands
-    CommandInfo testClustertestStructArgumentRequestCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testStructArgumentRequest(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("a"),
-                      (Boolean) commandArguments.get("b"),
-                      (Integer) commandArguments.get("c"),
-                      (byte[]) commandArguments.get("d"),
-                      (String) commandArguments.get("e"),
-                      (Integer) commandArguments.get("f"));
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestStructArgumentRequestCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> testClustertestUnknownCommandCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter testClustertestUnknownCommandCommandParameter =
-        new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo testClustertestUnknownCommandCommandParameterInfo =
-        new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo testClustertestUnknownCommandCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.TestClusterCluster) cluster)
-                  .testUnknownCommand((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            testClustertestUnknownCommandCommandParams);
-    testClusterClusterCommandInfoMap.put(
-        "testUnknownCommand", testClustertestUnknownCommandCommandInfo);
-    // Populate cluster
-    ClusterInfo testClusterClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            testCluster_ClusterCommandInfo);
-    clusterMap.put("testCluster", testCluster_clusterInfo);
-    Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> thermostat_clearWeeklySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> thermostat_clearWeeklySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            testClusterClusterCommandInfo);
-    clusterMap.put("testCluster", testClusterClusterInfo);
-    Map<String, CommandInfo> thermostatClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> thermostatclearWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter thermostatclearWeeklyScheduleCommandParameter =
-        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            testClusterClusterCommandInfoMap);
-    clusterMap.put("testCluster", testClusterClusterInfo);
-    Map<String, CommandInfo> thermostatClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo thermostatclearWeeklyScheduleCommandParameterInfo =
-        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo thermostatclearWeeklyScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .clearWeeklySchedule((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            thermostat_clearWeeklySchedule_commandParams);
-    thermostat_ClusterCommandInfo.put(
-        "clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> thermostat_getRelayStatusLog_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> thermostat_getRelayStatusLog_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            thermostatclearWeeklyScheduleCommandParams);
-    thermostatClusterCommandInfoMap.put(
-        "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> thermostatgetRelayStatusLogCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter thermostatgetRelayStatusLogCommandParameter =
-        new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo thermostatgetRelayStatusLogCommandParameterInfo =
-        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo thermostatgetRelayStatusLogCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .getRelayStatusLog((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            thermostat_getRelayStatusLog_commandParams);
-    thermostat_ClusterCommandInfo.put(
-        "getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> thermostat_getWeeklySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter getWeeklySchedule_daysToReturn_commandParameter =
-        new CommandParameter("daysToReturn", int.class);
-    thermostat_getWeeklySchedule_commandParams.add(getWeeklySchedule_daysToReturn_commandParameter);
-
-    CommandParameter getWeeklySchedule_modeToReturn_commandParameter =
-        new CommandParameter("modeToReturn", int.class);
-    thermostat_getWeeklySchedule_commandParams.add(getWeeklySchedule_modeToReturn_commandParameter);
-=======
-    Map<String, CommandParameter> thermostat_getWeeklySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            thermostatgetRelayStatusLogCommandParams);
-<<<<<<< HEAD
-    thermostatClusterCommandInfo.put("getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
-    Map<String, CommandParameter> thermostatgetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    thermostatClusterCommandInfoMap.put(
-        "getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
-    Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo thermostatgetWeeklyScheduleCommandParameterInfo =
-        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
-        new CommandParameterInfo("daysToReturn", int.class);
-    thermostatgetWeeklyScheduleCommandParams.put(
-        "daysToReturn", thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter thermostatgetWeeklySchedulemodeToReturnCommandParameter =
-        new CommandParameter("modeToReturn", int.class);
-<<<<<<< HEAD
-    thermostat_getWeeklySchedule_commandParams.put(
-        "modeToReturn", thermostat_getWeeklySchedule_modeToReturn_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    thermostatgetWeeklyScheduleCommandParams.put(
-        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo =
-        new CommandParameterInfo("modeToReturn", int.class);
-    thermostatgetWeeklyScheduleCommandParams.put(
-        "modeToReturn", thermostatgetWeeklySchedulemodeToReturnCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo thermostatgetWeeklyScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .getWeeklySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("daysToReturn"),
-                      (Integer) commandArguments.get("modeToReturn"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            thermostat_getWeeklySchedule_commandParams);
-    thermostat_ClusterCommandInfo.put(
-        "getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> thermostat_setWeeklySchedule_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setWeeklySchedule_numberOfTransitionsForSequence_commandParameter =
-        new CommandParameter("numberOfTransitionsForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.add(
-        setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
-
-    CommandParameter setWeeklySchedule_dayOfWeekForSequence_commandParameter =
-        new CommandParameter("dayOfWeekForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.add(
-        setWeeklySchedule_dayOfWeekForSequence_commandParameter);
-
-    CommandParameter setWeeklySchedule_modeForSequence_commandParameter =
-        new CommandParameter("modeForSequence", int.class);
-    thermostat_setWeeklySchedule_commandParams.add(
-        setWeeklySchedule_modeForSequence_commandParameter);
-
-    CommandParameter setWeeklySchedule_payload_commandParameter =
-        new CommandParameter("payload", int.class);
-    thermostat_setWeeklySchedule_commandParams.add(setWeeklySchedule_payload_commandParameter);
-=======
-    Map<String, CommandParameter> thermostat_setWeeklySchedule_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            thermostatgetWeeklyScheduleCommandParams);
-<<<<<<< HEAD
-    thermostatClusterCommandInfo.put("getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
-    Map<String, CommandParameter> thermostatsetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    thermostatClusterCommandInfoMap.put(
-        "getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
-    Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo thermostatsetWeeklyScheduleCommandParameterInfo =
-        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo
-        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo =
-            new CommandParameterInfo("numberOfTransitionsForSequence", int.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "numberOfTransitionsForSequence",
-        thermostatsetWeeklySchedulenumberOfTransitionsForSequenceCommandParameterInfo);
-
-    CommandParameterInfo thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo =
-        new CommandParameterInfo("dayOfWeekForSequence", int.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "dayOfWeekForSequence",
-        thermostatsetWeeklyScheduledayOfWeekForSequenceCommandParameterInfo);
-
-    CommandParameterInfo thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo =
-        new CommandParameterInfo("modeForSequence", int.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "modeForSequence", thermostatsetWeeklySchedulemodeForSequenceCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter thermostatsetWeeklySchedulepayloadCommandParameter =
-        new CommandParameter("payload", int.class);
-<<<<<<< HEAD
-    thermostat_setWeeklySchedule_commandParams.put(
-        "payload", thermostat_setWeeklySchedule_payload_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "payload", thermostatsetWeeklySchedulepayloadCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo thermostatsetWeeklySchedulepayloadCommandParameterInfo =
-        new CommandParameterInfo("payload", int.class);
-    thermostatsetWeeklyScheduleCommandParams.put(
-        "payload", thermostatsetWeeklySchedulepayloadCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo thermostatsetWeeklyScheduleCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .setWeeklySchedule(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("numberOfTransitionsForSequence"),
-                      (Integer) commandArguments.get("dayOfWeekForSequence"),
-                      (Integer) commandArguments.get("modeForSequence"),
-                      (Integer) commandArguments.get("payload"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            thermostat_setWeeklySchedule_commandParams);
-    thermostat_ClusterCommandInfo.put(
-        "setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> thermostat_setpointRaiseLower_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter setpointRaiseLower_mode_commandParameter =
-        new CommandParameter("mode", int.class);
-    thermostat_setpointRaiseLower_commandParams.add(setpointRaiseLower_mode_commandParameter);
-
-    CommandParameter setpointRaiseLower_amount_commandParameter =
-        new CommandParameter("amount", int.class);
-    thermostat_setpointRaiseLower_commandParams.add(setpointRaiseLower_amount_commandParameter);
-=======
-    Map<String, CommandParameter> thermostat_setpointRaiseLower_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            thermostatsetWeeklyScheduleCommandParams);
-<<<<<<< HEAD
-    thermostatClusterCommandInfo.put("setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
-    Map<String, CommandParameter> thermostatsetpointRaiseLowerCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    thermostatClusterCommandInfoMap.put(
-        "setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
-    Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo thermostatsetpointRaiseLowerCommandParameterInfo =
-        new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
-        new CommandParameterInfo("mode", int.class);
-    thermostatsetpointRaiseLowerCommandParams.put(
-        "mode", thermostatsetpointRaiseLowermodeCommandParameterInfo);
-
-<<<<<<< HEAD
-    CommandParameter thermostatsetpointRaiseLoweramountCommandParameter =
-        new CommandParameter("amount", int.class);
-<<<<<<< HEAD
-    thermostat_setpointRaiseLower_commandParams.put(
-        "amount", thermostat_setpointRaiseLower_amount_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    thermostatsetpointRaiseLowerCommandParams.put(
-        "amount", thermostatsetpointRaiseLoweramountCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    CommandParameterInfo thermostatsetpointRaiseLoweramountCommandParameterInfo =
-        new CommandParameterInfo("amount", int.class);
-    thermostatsetpointRaiseLowerCommandParams.put(
-        "amount", thermostatsetpointRaiseLoweramountCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo thermostatsetpointRaiseLowerCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThermostatCluster) cluster)
-                  .setpointRaiseLower(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("mode"),
-                      (Integer) commandArguments.get("amount"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            thermostatsetpointRaiseLowerCommandParams);
-    thermostatClusterCommandInfoMap.put(
-        "setpointRaiseLower", thermostatsetpointRaiseLowerCommandInfo);
-    // Populate cluster
-    ClusterInfo thermostatClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId),
-            thermostatClusterCommandInfoMap);
-    clusterMap.put("thermostat", thermostatClusterInfo);
-    Map<String, CommandInfo> thermostatUserInterfaceConfigurationClusterCommandInfoMap =
-        new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo thermostatUserInterfaceConfigurationClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) ->
-                new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId),
-            thermostatUserInterfaceConfigurationClusterCommandInfoMap);
-    clusterMap.put(
-<<<<<<< HEAD
-        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
-    Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-        "thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfigurationClusterInfo);
-<<<<<<< HEAD
-    Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> threadNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter threadNetworkDiagnosticsresetCountsCommandParameter =
-        new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo threadNetworkDiagnosticsresetCountsCommandParameterInfo =
-        new CommandParameterInfo(
-            "ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo threadNetworkDiagnosticsresetCountsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            threadNetworkDiagnosticsresetCountsCommandParams);
-    threadNetworkDiagnosticsClusterCommandInfoMap.put(
-        "resetCounts", threadNetworkDiagnosticsresetCountsCommandInfo);
-    // Populate cluster
-    ClusterInfo threadNetworkDiagnosticsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId),
-            threadNetworkDiagnosticsClusterCommandInfoMap);
-    clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> wakeOnLanClusterCommandInfoMap = new LinkedHashMap<>();
-    // Populate cluster
-    ClusterInfo wakeOnLanClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            wakeOnLan_ClusterCommandInfo);
-    clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
-    Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            wakeOnLanClusterCommandInfo);
-    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
-    Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> wiFiNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter wiFiNetworkDiagnosticsresetCountsCommandParameter =
-        new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            wakeOnLanClusterCommandInfoMap);
-    clusterMap.put("wakeOnLan", wakeOnLanClusterInfo);
-    Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo wiFiNetworkDiagnosticsresetCountsCommandParameterInfo =
-        new CommandParameterInfo(
-            "WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo wiFiNetworkDiagnosticsresetCountsCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                  .resetCounts((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-            wiFiNetworkDiagnosticsresetCountsCommandParams);
-    wiFiNetworkDiagnosticsClusterCommandInfoMap.put(
-        "resetCounts", wiFiNetworkDiagnosticsresetCountsCommandInfo);
-    // Populate cluster
-    ClusterInfo wiFiNetworkDiagnosticsClusterInfo =
-        new ClusterInfo(
-            (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId),
-<<<<<<< HEAD
-<<<<<<< HEAD
-            wiFiNetworkDiagnostics_ClusterCommandInfo);
-    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
-    Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_downOrClose_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> windowCovering_downOrClose_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            wiFiNetworkDiagnosticsClusterCommandInfo);
-    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> windowCoveringClusterCommandInfo = new LinkedHashMap<>();
-    Map<String, CommandParameter> windowCoveringdownOrCloseCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter windowCoveringdownOrCloseCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-            wiFiNetworkDiagnosticsClusterCommandInfoMap);
-    clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnosticsClusterInfo);
-    Map<String, CommandInfo> windowCoveringClusterCommandInfoMap = new LinkedHashMap<>();
-    Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringdownOrCloseCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo windowCoveringdownOrCloseCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .downOrClose((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_downOrClose_commandParams);
-    windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_goToLiftPercentage_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter goToLiftPercentage_liftPercentageValue_commandParameter =
-        new CommandParameter("liftPercentageValue", int.class);
-    windowCovering_goToLiftPercentage_commandParams.add(
-        goToLiftPercentage_liftPercentageValue_commandParameter);
-
-    CommandParameter goToLiftPercentage_liftPercent100thsValue_commandParameter =
-        new CommandParameter("liftPercent100thsValue", int.class);
-    windowCovering_goToLiftPercentage_commandParams.add(
-        goToLiftPercentage_liftPercent100thsValue_commandParameter);
-=======
-    Map<String, CommandParameter> windowCovering_goToLiftPercentage_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringdownOrCloseCommandParams);
-<<<<<<< HEAD
-    windowCoveringClusterCommandInfo.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
-    Map<String, CommandParameter> windowCoveringgoToLiftPercentageCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    windowCoveringClusterCommandInfoMap.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringgoToLiftPercentageCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo =
-        new CommandParameterInfo("liftPercentageValue", int.class);
-    windowCoveringgoToLiftPercentageCommandParams.put(
-        "liftPercentageValue",
-        windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo);
-
-    CommandParameterInfo
-        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("liftPercent100thsValue", int.class);
-    windowCoveringgoToLiftPercentageCommandParams.put(
-        "liftPercent100thsValue",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        windowCoveringgoToLiftPercentageliftPercent100thsValueCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo windowCoveringgoToLiftPercentageCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToLiftPercentage(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("liftPercentageValue"),
-                      (Integer) commandArguments.get("liftPercent100thsValue"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_goToLiftPercentage_commandParams);
-    windowCovering_ClusterCommandInfo.put(
-        "goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_goToLiftValue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter goToLiftValue_liftValue_commandParameter =
-        new CommandParameter("liftValue", int.class);
-    windowCovering_goToLiftValue_commandParams.add(goToLiftValue_liftValue_commandParameter);
-=======
-    Map<String, CommandParameter> windowCovering_goToLiftValue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringgoToLiftPercentageCommandParams);
-    windowCoveringClusterCommandInfoMap.put(
-        "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> windowCoveringgoToLiftValueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter windowCoveringgoToLiftValueCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameter windowCoveringgoToLiftValueliftValueCommandParameter =
-        new CommandParameter("liftValue", int.class);
-<<<<<<< HEAD
-    windowCovering_goToLiftValue_commandParams.put(
-        "liftValue", windowCovering_goToLiftValue_liftValue_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    windowCoveringgoToLiftValueCommandParams.put(
-        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringgoToLiftValueCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
-        new CommandParameterInfo("liftValue", int.class);
-    windowCoveringgoToLiftValueCommandParams.put(
-        "liftValue", windowCoveringgoToLiftValueliftValueCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo windowCoveringgoToLiftValueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToLiftValue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("liftValue"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_goToLiftValue_commandParams);
-    windowCovering_ClusterCommandInfo.put(
-        "goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_goToTiltPercentage_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter goToTiltPercentage_tiltPercentageValue_commandParameter =
-        new CommandParameter("tiltPercentageValue", int.class);
-    windowCovering_goToTiltPercentage_commandParams.add(
-        goToTiltPercentage_tiltPercentageValue_commandParameter);
-
-    CommandParameter goToTiltPercentage_tiltPercent100thsValue_commandParameter =
-        new CommandParameter("tiltPercent100thsValue", int.class);
-    windowCovering_goToTiltPercentage_commandParams.add(
-        goToTiltPercentage_tiltPercent100thsValue_commandParameter);
-=======
-    Map<String, CommandParameter> windowCovering_goToTiltPercentage_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringgoToLiftValueCommandParams);
-<<<<<<< HEAD
-    windowCoveringClusterCommandInfo.put("goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
-    Map<String, CommandParameter> windowCoveringgoToTiltPercentageCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    windowCoveringClusterCommandInfoMap.put(
-        "goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
-    Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringgoToTiltPercentageCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo =
-        new CommandParameterInfo("tiltPercentageValue", int.class);
-    windowCoveringgoToTiltPercentageCommandParams.put(
-        "tiltPercentageValue",
-        windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo);
-
-    CommandParameterInfo
-        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo =
-            new CommandParameterInfo("tiltPercent100thsValue", int.class);
-    windowCoveringgoToTiltPercentageCommandParams.put(
-        "tiltPercent100thsValue",
-<<<<<<< HEAD
-<<<<<<< HEAD
-        windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameter);
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-        windowCoveringgoToTiltPercentagetiltPercent100thsValueCommandParameterInfo);
->>>>>>> fde1d13c0 (fix comments)
-
-    // Populate commands
-    CommandInfo windowCoveringgoToTiltPercentageCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToTiltPercentage(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("tiltPercentageValue"),
-                      (Integer) commandArguments.get("tiltPercent100thsValue"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_goToTiltPercentage_commandParams);
-    windowCovering_ClusterCommandInfo.put(
-        "goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_goToTiltValue_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-    CommandParameter goToTiltValue_tiltValue_commandParameter =
-        new CommandParameter("tiltValue", int.class);
-    windowCovering_goToTiltValue_commandParams.add(goToTiltValue_tiltValue_commandParameter);
-
-<<<<<<< HEAD
-    windowCovering_goToTiltValue_commandInfo.parameters =
-        windowCovering_goToTiltValue_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_goToTiltValue_commandInfo);
-    List<CommandParameter> windowCovering_stopMotion_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_stopMotion_commandInfo = new CommandInfo();
-    windowCovering_stopMotion_commandInfo.name = "stopMotion";
-    windowCovering_stopMotion_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    windowCovering_stopMotion_commandInfo.parameters = windowCovering_stopMotion_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_stopMotion_commandInfo);
-    List<CommandParameter> windowCovering_upOrOpen_parametersList = new ArrayList<>();
-    CommandInfo windowCovering_upOrOpen_commandInfo = new CommandInfo();
-    windowCovering_upOrOpen_commandInfo.name = "upOrOpen";
-    windowCovering_upOrOpen_commandInfo.callbackClass = ChipClusters.DefaultClusterCallback.class;
-    windowCovering_upOrOpen_commandInfo.parameters = windowCovering_upOrOpen_parametersList;
-    windowCovering_clusterInfo.commands.add(windowCovering_upOrOpen_commandInfo);
-    clusterInfoMapping.put("windowCovering", windowCovering_clusterInfo);
-    return clusterInfoMapping;
->>>>>>> a4fd0282e (no error code generation)
-=======
-=======
-    Map<String, CommandParameter> windowCovering_goToTiltValue_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringgoToTiltPercentageCommandParams);
-    windowCoveringClusterCommandInfoMap.put(
-        "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
-<<<<<<< HEAD
-    Map<String, CommandParameter> windowCoveringgoToTiltValueCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-=======
-    Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
->>>>>>> fde1d13c0 (fix comments)
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringgoToTiltValueCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-    CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
-        new CommandParameterInfo("tiltValue", int.class);
-    windowCoveringgoToTiltValueCommandParams.put(
-        "tiltValue", windowCoveringgoToTiltValuetiltValueCommandParameterInfo);
-
->>>>>>> 677ef48a5 (callback generation done)
-    // Populate commands
-    CommandInfo windowCoveringgoToTiltValueCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .goToTiltValue(
-                      (DefaultClusterCallback) callback,
-                      (Integer) commandArguments.get("tiltValue"));
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_goToTiltValue_commandParams);
-    windowCovering_ClusterCommandInfo.put(
-        "goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_stopMotion_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> windowCovering_stopMotion_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringgoToTiltValueCommandParams);
-<<<<<<< HEAD
-    windowCoveringClusterCommandInfo.put("goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
-    Map<String, CommandParameter> windowCoveringstopMotionCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter windowCoveringstopMotionCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    windowCoveringClusterCommandInfoMap.put(
-        "goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
-    Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
-        new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
-    CommandParameterInfo windowCoveringstopMotionCommandParameterInfo =
-        new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
-    // Populate commands
-    CommandInfo windowCoveringstopMotionCommandInfo =
-        new CommandInfo(
-            (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
-              ((ChipClusters.WindowCoveringCluster) cluster)
-                  .stopMotion((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
-            },
-            () -> new DelegatedDefaultClusterCallback(),
-<<<<<<< HEAD
-            windowCovering_stopMotion_commandParams);
-    windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
-<<<<<<< HEAD
-    List<CommandParameter> windowCovering_upOrOpen_commandParams = new ArrayList<>();
-    // TODO: fill out parameter types
-
-=======
-    Map<String, CommandParameter> windowCovering_upOrOpen_commandParams =
-        new HashMap<String, CommandParameter>();
-=======
-            windowCoveringstopMotionCommandParams);
-<<<<<<< HEAD
-    windowCoveringClusterCommandInfo.put("stopMotion", windowCoveringstopMotionCommandInfo);
-    Map<String, CommandParameter> windowCoveringupOrOpenCommandParams =
-        new LinkedHashMap<String, CommandParameter>();
->>>>>>> 41b0956c1 (on/off commands working)
-    // TODO: fill out parameter types
-    CommandParameter windowCoveringupOrOpenCommandParameter =
-        new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> 677ef48a5 (callback generation done)
-=======
-    windowCoveringClusterCommandInfoMap.put("stopMotion", windowCoveringstopMotionCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
     // TODO: fill out parameter types
     CommandParameterInfo windowCoveringupOrOpenCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
->>>>>>> fde1d13c0 (fix comments)
     // Populate commands
     CommandInfo windowCoveringupOrOpenCommandInfo =
         new CommandInfo(
             (cluster, callback, commandArguments) -> {
-<<<<<<< HEAD
-              // TODO: expose index in template helper
-=======
               ((ChipClusters.WindowCoveringCluster) cluster)
                   .upOrOpen((DefaultClusterCallback) callback);
->>>>>>> 677ef48a5 (callback generation done)
             },
             () -> new DelegatedDefaultClusterCallback(),
             windowCoveringupOrOpenCommandParams);
@@ -21206,3735 +7489,5 @@ >>>>>>> fde1d13c0 (fix comments)
             windowCoveringClusterCommandInfoMap);
     clusterMap.put("windowCovering", windowCoveringClusterInfo);
     return clusterMap;
-<<<<<<< HEAD
->>>>>>> 2d2bbd2e1 (new design solution)
-=======
- public Map<String, ClusterInfo> getClusterMap() {
-     Map<String, ClusterInfo> clusterMap = new HashMap<>();
-     Map<String, CommandInfo> accountLogin_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> accountLogin_getSetupPIN_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter accountLogin_getSetupPIN_commandParameter = new CommandParameter("AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
-                 CommandParameter accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter = new CommandParameter("tempAccountIdentifier", String.class);
-                 accountLogin_getSetupPIN_commandParams.put("tempAccountIdentifier",accountLogin_getSetupPIN_tempAccountIdentifier_commandParameter);
-                 
-           // Populate commands
-           CommandInfo accountLogin_getSetupPIN_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AccountLoginCluster) cluster)
-                           .getSetupPIN((ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback) callback
-                           ,  accountLogin_getSetupPIN_commandParams.get("tempAccountIdentifier") commandArguments.get("tempAccountIdentifier")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   accountLogin_getSetupPIN_commandParams
-           );
-           accountLogin_ClusterCommandInfo.put("getSetupPIN", accountLogin_getSetupPIN_CommandInfo);
-           Map<String, CommandParameter> accountLogin_login_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter accountLogin_login_commandParameter = new CommandParameter("AccountLogin", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter accountLogin_login_tempAccountIdentifier_commandParameter = new CommandParameter("tempAccountIdentifier", String.class);
-                 accountLogin_login_commandParams.put("tempAccountIdentifier",accountLogin_login_tempAccountIdentifier_commandParameter);
-                  
-                 CommandParameter accountLogin_login_setupPIN_commandParameter = new CommandParameter("setupPIN", String.class);
-                 accountLogin_login_commandParams.put("setupPIN",accountLogin_login_setupPIN_commandParameter);
-                 
-           // Populate commands
-           CommandInfo accountLogin_login_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AccountLoginCluster) cluster)
-                          .login((DefaultClusterCallback) callback
-                          ,  accountLogin_login_commandParams.get("tempAccountIdentifier") commandArguments.get("tempAccountIdentifier")
-                          ,  accountLogin_login_commandParams.get("setupPIN") commandArguments.get("setupPIN")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   accountLogin_login_commandParams
-           );
-           accountLogin_ClusterCommandInfo.put("login", accountLogin_login_CommandInfo);
-     // Populate cluster
-     ClusterInfo accountLogin_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.AccountLoginCluster(ptr, endpointId), accountLogin_ClusterCommandInfo);
-     clusterMap.put("accountLogin", accountLogin_clusterInfo);
-     Map<String, CommandInfo> administratorCommissioning_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> administratorCommissioning_openBasicCommissioningWindow_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter administratorCommissioning_openBasicCommissioningWindow_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter = new CommandParameter("commissioningTimeout", int.class);
-                 administratorCommissioning_openBasicCommissioningWindow_commandParams.put("commissioningTimeout",administratorCommissioning_openBasicCommissioningWindow_commissioningTimeout_commandParameter);
-                 
-           // Populate commands
-           CommandInfo administratorCommissioning_openBasicCommissioningWindow_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                          .openBasicCommissioningWindow((DefaultClusterCallback) callback
-                          ,  administratorCommissioning_openBasicCommissioningWindow_commandParams.get("commissioningTimeout") commandArguments.get("commissioningTimeout")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   administratorCommissioning_openBasicCommissioningWindow_commandParams
-           );
-           administratorCommissioning_ClusterCommandInfo.put("openBasicCommissioningWindow", administratorCommissioning_openBasicCommissioningWindow_CommandInfo);
-           Map<String, CommandParameter> administratorCommissioning_openCommissioningWindow_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter administratorCommissioning_openCommissioningWindow_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter = new CommandParameter("commissioningTimeout", int.class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("commissioningTimeout",administratorCommissioning_openCommissioningWindow_commissioningTimeout_commandParameter);
-                  
-                 CommandParameter administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter = new CommandParameter("PAKEVerifier", byte[].class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("PAKEVerifier",administratorCommissioning_openCommissioningWindow_PAKEVerifier_commandParameter);
-                  
-                 CommandParameter administratorCommissioning_openCommissioningWindow_discriminator_commandParameter = new CommandParameter("discriminator", int.class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("discriminator",administratorCommissioning_openCommissioningWindow_discriminator_commandParameter);
-                  
-                 CommandParameter administratorCommissioning_openCommissioningWindow_iterations_commandParameter = new CommandParameter("iterations", long.class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("iterations",administratorCommissioning_openCommissioningWindow_iterations_commandParameter);
-                  
-                 CommandParameter administratorCommissioning_openCommissioningWindow_salt_commandParameter = new CommandParameter("salt", byte[].class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("salt",administratorCommissioning_openCommissioningWindow_salt_commandParameter);
-                  
-                 CommandParameter administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter = new CommandParameter("passcodeID", int.class);
-                 administratorCommissioning_openCommissioningWindow_commandParams.put("passcodeID",administratorCommissioning_openCommissioningWindow_passcodeID_commandParameter);
-                 
-           // Populate commands
-           CommandInfo administratorCommissioning_openCommissioningWindow_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                          .openCommissioningWindow((DefaultClusterCallback) callback
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("commissioningTimeout") commandArguments.get("commissioningTimeout")
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("PAKEVerifier") commandArguments.get("PAKEVerifier")
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("discriminator") commandArguments.get("discriminator")
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("iterations") commandArguments.get("iterations")
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("salt") commandArguments.get("salt")
-                          ,  administratorCommissioning_openCommissioningWindow_commandParams.get("passcodeID") commandArguments.get("passcodeID")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   administratorCommissioning_openCommissioningWindow_commandParams
-           );
-           administratorCommissioning_ClusterCommandInfo.put("openCommissioningWindow", administratorCommissioning_openCommissioningWindow_CommandInfo);
-           Map<String, CommandParameter> administratorCommissioning_revokeCommissioning_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter administratorCommissioning_revokeCommissioning_commandParameter = new CommandParameter("AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo administratorCommissioning_revokeCommissioning_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AdministratorCommissioningCluster) cluster)
-                          .revokeCommissioning((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   administratorCommissioning_revokeCommissioning_commandParams
-           );
-           administratorCommissioning_ClusterCommandInfo.put("revokeCommissioning", administratorCommissioning_revokeCommissioning_CommandInfo);
-     // Populate cluster
-     ClusterInfo administratorCommissioning_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.AdministratorCommissioningCluster(ptr, endpointId), administratorCommissioning_ClusterCommandInfo);
-     clusterMap.put("administratorCommissioning", administratorCommissioning_clusterInfo);
-     Map<String, CommandInfo> applicationBasic_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> applicationBasic_changeStatus_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter applicationBasic_changeStatus_commandParameter = new CommandParameter("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter applicationBasic_changeStatus_status_commandParameter = new CommandParameter("status", int.class);
-                 applicationBasic_changeStatus_commandParams.put("status",applicationBasic_changeStatus_status_commandParameter);
-                 
-           // Populate commands
-           CommandInfo applicationBasic_changeStatus_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ApplicationBasicCluster) cluster)
-                          .changeStatus((DefaultClusterCallback) callback
-                          ,  applicationBasic_changeStatus_commandParams.get("status") commandArguments.get("status")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   applicationBasic_changeStatus_commandParams
-           );
-           applicationBasic_ClusterCommandInfo.put("changeStatus", applicationBasic_changeStatus_CommandInfo);
-     // Populate cluster
-     ClusterInfo applicationBasic_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ApplicationBasicCluster(ptr, endpointId), applicationBasic_ClusterCommandInfo);
-     clusterMap.put("applicationBasic", applicationBasic_clusterInfo);
-     Map<String, CommandInfo> applicationLauncher_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> applicationLauncher_launchApp_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter applicationLauncher_launchApp_commandParameter = new CommandParameter("ApplicationLauncher", ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback.class);
-                 CommandParameter applicationLauncher_launchApp_data_commandParameter = new CommandParameter("data", String.class);
-                 applicationLauncher_launchApp_commandParams.put("data",applicationLauncher_launchApp_data_commandParameter);
-                  
-                 CommandParameter applicationLauncher_launchApp_catalogVendorId_commandParameter = new CommandParameter("catalogVendorId", int.class);
-                 applicationLauncher_launchApp_commandParams.put("catalogVendorId",applicationLauncher_launchApp_catalogVendorId_commandParameter);
-                  
-                 CommandParameter applicationLauncher_launchApp_applicationId_commandParameter = new CommandParameter("applicationId", String.class);
-                 applicationLauncher_launchApp_commandParams.put("applicationId",applicationLauncher_launchApp_applicationId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo applicationLauncher_launchApp_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ApplicationLauncherCluster) cluster)
-                           .launchApp((ChipClusters.ApplicationLauncherCluster.LaunchAppResponseCallback) callback
-                           ,  applicationLauncher_launchApp_commandParams.get("data") commandArguments.get("data")
-                           ,  applicationLauncher_launchApp_commandParams.get("catalogVendorId") commandArguments.get("catalogVendorId")
-                           ,  applicationLauncher_launchApp_commandParams.get("applicationId") commandArguments.get("applicationId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   applicationLauncher_launchApp_commandParams
-           );
-           applicationLauncher_ClusterCommandInfo.put("launchApp", applicationLauncher_launchApp_CommandInfo);
-     // Populate cluster
-     ClusterInfo applicationLauncher_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ApplicationLauncherCluster(ptr, endpointId), applicationLauncher_ClusterCommandInfo);
-     clusterMap.put("applicationLauncher", applicationLauncher_clusterInfo);
-     Map<String, CommandInfo> audioOutput_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> audioOutput_renameOutput_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter audioOutput_renameOutput_commandParameter = new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter audioOutput_renameOutput_index_commandParameter = new CommandParameter("index", int.class);
-                 audioOutput_renameOutput_commandParams.put("index",audioOutput_renameOutput_index_commandParameter);
-                  
-                 CommandParameter audioOutput_renameOutput_name_commandParameter = new CommandParameter("name", String.class);
-                 audioOutput_renameOutput_commandParams.put("name",audioOutput_renameOutput_name_commandParameter);
-                 
-           // Populate commands
-           CommandInfo audioOutput_renameOutput_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AudioOutputCluster) cluster)
-                          .renameOutput((DefaultClusterCallback) callback
-                          ,  audioOutput_renameOutput_commandParams.get("index") commandArguments.get("index")
-                          ,  audioOutput_renameOutput_commandParams.get("name") commandArguments.get("name")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   audioOutput_renameOutput_commandParams
-           );
-           audioOutput_ClusterCommandInfo.put("renameOutput", audioOutput_renameOutput_CommandInfo);
-           Map<String, CommandParameter> audioOutput_selectOutput_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter audioOutput_selectOutput_commandParameter = new CommandParameter("AudioOutput", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter audioOutput_selectOutput_index_commandParameter = new CommandParameter("index", int.class);
-                 audioOutput_selectOutput_commandParams.put("index",audioOutput_selectOutput_index_commandParameter);
-                 
-           // Populate commands
-           CommandInfo audioOutput_selectOutput_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.AudioOutputCluster) cluster)
-                          .selectOutput((DefaultClusterCallback) callback
-                          ,  audioOutput_selectOutput_commandParams.get("index") commandArguments.get("index")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   audioOutput_selectOutput_commandParams
-           );
-           audioOutput_ClusterCommandInfo.put("selectOutput", audioOutput_selectOutput_CommandInfo);
-     // Populate cluster
-     ClusterInfo audioOutput_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.AudioOutputCluster(ptr, endpointId), audioOutput_ClusterCommandInfo);
-     clusterMap.put("audioOutput", audioOutput_clusterInfo);
-     Map<String, CommandInfo> barrierControl_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> barrierControl_barrierControlGoToPercent_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter barrierControl_barrierControlGoToPercent_commandParameter = new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter barrierControl_barrierControlGoToPercent_percentOpen_commandParameter = new CommandParameter("percentOpen", int.class);
-                 barrierControl_barrierControlGoToPercent_commandParams.put("percentOpen",barrierControl_barrierControlGoToPercent_percentOpen_commandParameter);
-                 
-           // Populate commands
-           CommandInfo barrierControl_barrierControlGoToPercent_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.BarrierControlCluster) cluster)
-                          .barrierControlGoToPercent((DefaultClusterCallback) callback
-                          ,  barrierControl_barrierControlGoToPercent_commandParams.get("percentOpen") commandArguments.get("percentOpen")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   barrierControl_barrierControlGoToPercent_commandParams
-           );
-           barrierControl_ClusterCommandInfo.put("barrierControlGoToPercent", barrierControl_barrierControlGoToPercent_CommandInfo);
-           Map<String, CommandParameter> barrierControl_barrierControlStop_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter barrierControl_barrierControlStop_commandParameter = new CommandParameter("BarrierControl", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo barrierControl_barrierControlStop_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.BarrierControlCluster) cluster)
-                          .barrierControlStop((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   barrierControl_barrierControlStop_commandParams
-           );
-           barrierControl_ClusterCommandInfo.put("barrierControlStop", barrierControl_barrierControlStop_CommandInfo);
-     // Populate cluster
-     ClusterInfo barrierControl_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.BarrierControlCluster(ptr, endpointId), barrierControl_ClusterCommandInfo);
-     clusterMap.put("barrierControl", barrierControl_clusterInfo);
-     Map<String, CommandInfo> basic_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> basic_mfgSpecificPing_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter basic_mfgSpecificPing_commandParameter = new CommandParameter("Basic", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo basic_mfgSpecificPing_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.BasicCluster) cluster)
-                          .mfgSpecificPing((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   basic_mfgSpecificPing_commandParams
-           );
-           basic_ClusterCommandInfo.put("mfgSpecificPing", basic_mfgSpecificPing_CommandInfo);
-     // Populate cluster
-     ClusterInfo basic_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.BasicCluster(ptr, endpointId), basic_ClusterCommandInfo);
-     clusterMap.put("basic", basic_clusterInfo);
-     Map<String, CommandInfo> binaryInputBasic_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo binaryInputBasic_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.BinaryInputBasicCluster(ptr, endpointId), binaryInputBasic_ClusterCommandInfo);
-     clusterMap.put("binaryInputBasic", binaryInputBasic_clusterInfo);
-     Map<String, CommandInfo> binding_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> binding_bind_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter binding_bind_commandParameter = new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter binding_bind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-                 binding_bind_commandParams.put("nodeId",binding_bind_nodeId_commandParameter);
-                  
-                 CommandParameter binding_bind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 binding_bind_commandParams.put("groupId",binding_bind_groupId_commandParameter);
-                  
-                 CommandParameter binding_bind_endpointId_commandParameter = new CommandParameter("endpointId", int.class);
-                 binding_bind_commandParams.put("endpointId",binding_bind_endpointId_commandParameter);
-                  
-                 CommandParameter binding_bind_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-                 binding_bind_commandParams.put("clusterId",binding_bind_clusterId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo binding_bind_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.BindingCluster) cluster)
-                          .bind((DefaultClusterCallback) callback
-                          ,  binding_bind_commandParams.get("nodeId") commandArguments.get("nodeId")
-                          ,  binding_bind_commandParams.get("groupId") commandArguments.get("groupId")
-                          ,  binding_bind_commandParams.get("endpointId") commandArguments.get("endpointId")
-                          ,  binding_bind_commandParams.get("clusterId") commandArguments.get("clusterId")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   binding_bind_commandParams
-           );
-           binding_ClusterCommandInfo.put("bind", binding_bind_CommandInfo);
-           Map<String, CommandParameter> binding_unbind_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter binding_unbind_commandParameter = new CommandParameter("Binding", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter binding_unbind_nodeId_commandParameter = new CommandParameter("nodeId", long.class);
-                 binding_unbind_commandParams.put("nodeId",binding_unbind_nodeId_commandParameter);
-                  
-                 CommandParameter binding_unbind_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 binding_unbind_commandParams.put("groupId",binding_unbind_groupId_commandParameter);
-                  
-                 CommandParameter binding_unbind_endpointId_commandParameter = new CommandParameter("endpointId", int.class);
-                 binding_unbind_commandParams.put("endpointId",binding_unbind_endpointId_commandParameter);
-                  
-                 CommandParameter binding_unbind_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-                 binding_unbind_commandParams.put("clusterId",binding_unbind_clusterId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo binding_unbind_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.BindingCluster) cluster)
-                          .unbind((DefaultClusterCallback) callback
-                          ,  binding_unbind_commandParams.get("nodeId") commandArguments.get("nodeId")
-                          ,  binding_unbind_commandParams.get("groupId") commandArguments.get("groupId")
-                          ,  binding_unbind_commandParams.get("endpointId") commandArguments.get("endpointId")
-                          ,  binding_unbind_commandParams.get("clusterId") commandArguments.get("clusterId")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   binding_unbind_commandParams
-           );
-           binding_ClusterCommandInfo.put("unbind", binding_unbind_CommandInfo);
-     // Populate cluster
-     ClusterInfo binding_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.BindingCluster(ptr, endpointId), binding_ClusterCommandInfo);
-     clusterMap.put("binding", binding_clusterInfo);
-     Map<String, CommandInfo> bridgedDeviceBasic_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo bridgedDeviceBasic_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.BridgedDeviceBasicCluster(ptr, endpointId), bridgedDeviceBasic_ClusterCommandInfo);
-     clusterMap.put("bridgedDeviceBasic", bridgedDeviceBasic_clusterInfo);
-     Map<String, CommandInfo> colorControl_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> colorControl_colorLoopSet_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_colorLoopSet_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_colorLoopSet_updateFlags_commandParameter = new CommandParameter("updateFlags", int.class);
-                 colorControl_colorLoopSet_commandParams.put("updateFlags",colorControl_colorLoopSet_updateFlags_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_action_commandParameter = new CommandParameter("action", int.class);
-                 colorControl_colorLoopSet_commandParams.put("action",colorControl_colorLoopSet_action_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_direction_commandParameter = new CommandParameter("direction", int.class);
-                 colorControl_colorLoopSet_commandParams.put("direction",colorControl_colorLoopSet_direction_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_time_commandParameter = new CommandParameter("time", int.class);
-                 colorControl_colorLoopSet_commandParams.put("time",colorControl_colorLoopSet_time_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_startHue_commandParameter = new CommandParameter("startHue", int.class);
-                 colorControl_colorLoopSet_commandParams.put("startHue",colorControl_colorLoopSet_startHue_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_colorLoopSet_commandParams.put("optionsMask",colorControl_colorLoopSet_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_colorLoopSet_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_colorLoopSet_commandParams.put("optionsOverride",colorControl_colorLoopSet_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_colorLoopSet_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .colorLoopSet((DefaultClusterCallback) callback
-                          ,  colorControl_colorLoopSet_commandParams.get("updateFlags") commandArguments.get("updateFlags")
-                          ,  colorControl_colorLoopSet_commandParams.get("action") commandArguments.get("action")
-                          ,  colorControl_colorLoopSet_commandParams.get("direction") commandArguments.get("direction")
-                          ,  colorControl_colorLoopSet_commandParams.get("time") commandArguments.get("time")
-                          ,  colorControl_colorLoopSet_commandParams.get("startHue") commandArguments.get("startHue")
-                          ,  colorControl_colorLoopSet_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_colorLoopSet_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_colorLoopSet_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("colorLoopSet", colorControl_colorLoopSet_CommandInfo);
-           Map<String, CommandParameter> colorControl_enhancedMoveHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_enhancedMoveHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_enhancedMoveHue_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 colorControl_enhancedMoveHue_commandParams.put("moveMode",colorControl_enhancedMoveHue_moveMode_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveHue_rate_commandParameter = new CommandParameter("rate", int.class);
-                 colorControl_enhancedMoveHue_commandParams.put("rate",colorControl_enhancedMoveHue_rate_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_enhancedMoveHue_commandParams.put("optionsMask",colorControl_enhancedMoveHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_enhancedMoveHue_commandParams.put("optionsOverride",colorControl_enhancedMoveHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_enhancedMoveHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .enhancedMoveHue((DefaultClusterCallback) callback
-                          ,  colorControl_enhancedMoveHue_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  colorControl_enhancedMoveHue_commandParams.get("rate") commandArguments.get("rate")
-                          ,  colorControl_enhancedMoveHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_enhancedMoveHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_enhancedMoveHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("enhancedMoveHue", colorControl_enhancedMoveHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_enhancedMoveToHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_enhancedMoveToHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_enhancedMoveToHue_enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
-                 colorControl_enhancedMoveToHue_commandParams.put("enhancedHue",colorControl_enhancedMoveToHue_enhancedHue_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHue_direction_commandParameter = new CommandParameter("direction", int.class);
-                 colorControl_enhancedMoveToHue_commandParams.put("direction",colorControl_enhancedMoveToHue_direction_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_enhancedMoveToHue_commandParams.put("transitionTime",colorControl_enhancedMoveToHue_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_enhancedMoveToHue_commandParams.put("optionsMask",colorControl_enhancedMoveToHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_enhancedMoveToHue_commandParams.put("optionsOverride",colorControl_enhancedMoveToHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_enhancedMoveToHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .enhancedMoveToHue((DefaultClusterCallback) callback
-                          ,  colorControl_enhancedMoveToHue_commandParams.get("enhancedHue") commandArguments.get("enhancedHue")
-                          ,  colorControl_enhancedMoveToHue_commandParams.get("direction") commandArguments.get("direction")
-                          ,  colorControl_enhancedMoveToHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_enhancedMoveToHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_enhancedMoveToHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_enhancedMoveToHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("enhancedMoveToHue", colorControl_enhancedMoveToHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_enhancedMoveToHueAndSaturation_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter = new CommandParameter("enhancedHue", int.class);
-                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("enhancedHue",colorControl_enhancedMoveToHueAndSaturation_enhancedHue_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
-                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("saturation",colorControl_enhancedMoveToHueAndSaturation_saturation_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("transitionTime",colorControl_enhancedMoveToHueAndSaturation_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("optionsMask",colorControl_enhancedMoveToHueAndSaturation_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_enhancedMoveToHueAndSaturation_commandParams.put("optionsOverride",colorControl_enhancedMoveToHueAndSaturation_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_enhancedMoveToHueAndSaturation_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .enhancedMoveToHueAndSaturation((DefaultClusterCallback) callback
-                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("enhancedHue") commandArguments.get("enhancedHue")
-                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("saturation") commandArguments.get("saturation")
-                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_enhancedMoveToHueAndSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_enhancedMoveToHueAndSaturation_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("enhancedMoveToHueAndSaturation", colorControl_enhancedMoveToHueAndSaturation_CommandInfo);
-           Map<String, CommandParameter> colorControl_enhancedStepHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_enhancedStepHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_enhancedStepHue_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 colorControl_enhancedStepHue_commandParams.put("stepMode",colorControl_enhancedStepHue_stepMode_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedStepHue_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 colorControl_enhancedStepHue_commandParams.put("stepSize",colorControl_enhancedStepHue_stepSize_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedStepHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_enhancedStepHue_commandParams.put("transitionTime",colorControl_enhancedStepHue_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedStepHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_enhancedStepHue_commandParams.put("optionsMask",colorControl_enhancedStepHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_enhancedStepHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_enhancedStepHue_commandParams.put("optionsOverride",colorControl_enhancedStepHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_enhancedStepHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .enhancedStepHue((DefaultClusterCallback) callback
-                          ,  colorControl_enhancedStepHue_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  colorControl_enhancedStepHue_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  colorControl_enhancedStepHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_enhancedStepHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_enhancedStepHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_enhancedStepHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("enhancedStepHue", colorControl_enhancedStepHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveColor_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveColor_rateX_commandParameter = new CommandParameter("rateX", int.class);
-                 colorControl_moveColor_commandParams.put("rateX",colorControl_moveColor_rateX_commandParameter);
-                  
-                 CommandParameter colorControl_moveColor_rateY_commandParameter = new CommandParameter("rateY", int.class);
-                 colorControl_moveColor_commandParams.put("rateY",colorControl_moveColor_rateY_commandParameter);
-                  
-                 CommandParameter colorControl_moveColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveColor_commandParams.put("optionsMask",colorControl_moveColor_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveColor_commandParams.put("optionsOverride",colorControl_moveColor_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveColor_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveColor((DefaultClusterCallback) callback
-                          ,  colorControl_moveColor_commandParams.get("rateX") commandArguments.get("rateX")
-                          ,  colorControl_moveColor_commandParams.get("rateY") commandArguments.get("rateY")
-                          ,  colorControl_moveColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveColor_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveColor", colorControl_moveColor_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveColorTemperature_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveColorTemperature_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("moveMode",colorControl_moveColorTemperature_moveMode_commandParameter);
-                  
-                 CommandParameter colorControl_moveColorTemperature_rate_commandParameter = new CommandParameter("rate", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("rate",colorControl_moveColorTemperature_rate_commandParameter);
-                  
-                 CommandParameter colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter = new CommandParameter("colorTemperatureMinimum", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("colorTemperatureMinimum",colorControl_moveColorTemperature_colorTemperatureMinimum_commandParameter);
-                  
-                 CommandParameter colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter = new CommandParameter("colorTemperatureMaximum", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("colorTemperatureMaximum",colorControl_moveColorTemperature_colorTemperatureMaximum_commandParameter);
-                  
-                 CommandParameter colorControl_moveColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("optionsMask",colorControl_moveColorTemperature_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveColorTemperature_commandParams.put("optionsOverride",colorControl_moveColorTemperature_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveColorTemperature_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveColorTemperature((DefaultClusterCallback) callback
-                          ,  colorControl_moveColorTemperature_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  colorControl_moveColorTemperature_commandParams.get("rate") commandArguments.get("rate")
-                          ,  colorControl_moveColorTemperature_commandParams.get("colorTemperatureMinimum") commandArguments.get("colorTemperatureMinimum")
-                          ,  colorControl_moveColorTemperature_commandParams.get("colorTemperatureMaximum") commandArguments.get("colorTemperatureMaximum")
-                          ,  colorControl_moveColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveColorTemperature_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveColorTemperature", colorControl_moveColorTemperature_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveHue_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 colorControl_moveHue_commandParams.put("moveMode",colorControl_moveHue_moveMode_commandParameter);
-                  
-                 CommandParameter colorControl_moveHue_rate_commandParameter = new CommandParameter("rate", int.class);
-                 colorControl_moveHue_commandParams.put("rate",colorControl_moveHue_rate_commandParameter);
-                  
-                 CommandParameter colorControl_moveHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveHue_commandParams.put("optionsMask",colorControl_moveHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveHue_commandParams.put("optionsOverride",colorControl_moveHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveHue((DefaultClusterCallback) callback
-                          ,  colorControl_moveHue_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  colorControl_moveHue_commandParams.get("rate") commandArguments.get("rate")
-                          ,  colorControl_moveHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveHue", colorControl_moveHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveSaturation_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveSaturation_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 colorControl_moveSaturation_commandParams.put("moveMode",colorControl_moveSaturation_moveMode_commandParameter);
-                  
-                 CommandParameter colorControl_moveSaturation_rate_commandParameter = new CommandParameter("rate", int.class);
-                 colorControl_moveSaturation_commandParams.put("rate",colorControl_moveSaturation_rate_commandParameter);
-                  
-                 CommandParameter colorControl_moveSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveSaturation_commandParams.put("optionsMask",colorControl_moveSaturation_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveSaturation_commandParams.put("optionsOverride",colorControl_moveSaturation_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveSaturation_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveSaturation((DefaultClusterCallback) callback
-                          ,  colorControl_moveSaturation_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  colorControl_moveSaturation_commandParams.get("rate") commandArguments.get("rate")
-                          ,  colorControl_moveSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveSaturation_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveSaturation", colorControl_moveSaturation_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveToColor_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveToColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveToColor_colorX_commandParameter = new CommandParameter("colorX", int.class);
-                 colorControl_moveToColor_commandParams.put("colorX",colorControl_moveToColor_colorX_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColor_colorY_commandParameter = new CommandParameter("colorY", int.class);
-                 colorControl_moveToColor_commandParams.put("colorY",colorControl_moveToColor_colorY_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColor_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_moveToColor_commandParams.put("transitionTime",colorControl_moveToColor_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveToColor_commandParams.put("optionsMask",colorControl_moveToColor_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveToColor_commandParams.put("optionsOverride",colorControl_moveToColor_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveToColor_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveToColor((DefaultClusterCallback) callback
-                          ,  colorControl_moveToColor_commandParams.get("colorX") commandArguments.get("colorX")
-                          ,  colorControl_moveToColor_commandParams.get("colorY") commandArguments.get("colorY")
-                          ,  colorControl_moveToColor_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_moveToColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveToColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveToColor_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveToColor", colorControl_moveToColor_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveToColorTemperature_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveToColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveToColorTemperature_colorTemperature_commandParameter = new CommandParameter("colorTemperature", int.class);
-                 colorControl_moveToColorTemperature_commandParams.put("colorTemperature",colorControl_moveToColorTemperature_colorTemperature_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColorTemperature_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_moveToColorTemperature_commandParams.put("transitionTime",colorControl_moveToColorTemperature_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveToColorTemperature_commandParams.put("optionsMask",colorControl_moveToColorTemperature_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveToColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveToColorTemperature_commandParams.put("optionsOverride",colorControl_moveToColorTemperature_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveToColorTemperature_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveToColorTemperature((DefaultClusterCallback) callback
-                          ,  colorControl_moveToColorTemperature_commandParams.get("colorTemperature") commandArguments.get("colorTemperature")
-                          ,  colorControl_moveToColorTemperature_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_moveToColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveToColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveToColorTemperature_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveToColorTemperature", colorControl_moveToColorTemperature_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveToHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveToHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveToHue_hue_commandParameter = new CommandParameter("hue", int.class);
-                 colorControl_moveToHue_commandParams.put("hue",colorControl_moveToHue_hue_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHue_direction_commandParameter = new CommandParameter("direction", int.class);
-                 colorControl_moveToHue_commandParams.put("direction",colorControl_moveToHue_direction_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_moveToHue_commandParams.put("transitionTime",colorControl_moveToHue_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveToHue_commandParams.put("optionsMask",colorControl_moveToHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveToHue_commandParams.put("optionsOverride",colorControl_moveToHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveToHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveToHue((DefaultClusterCallback) callback
-                          ,  colorControl_moveToHue_commandParams.get("hue") commandArguments.get("hue")
-                          ,  colorControl_moveToHue_commandParams.get("direction") commandArguments.get("direction")
-                          ,  colorControl_moveToHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_moveToHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveToHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveToHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveToHue", colorControl_moveToHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveToHueAndSaturation_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveToHueAndSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveToHueAndSaturation_hue_commandParameter = new CommandParameter("hue", int.class);
-                 colorControl_moveToHueAndSaturation_commandParams.put("hue",colorControl_moveToHueAndSaturation_hue_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHueAndSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
-                 colorControl_moveToHueAndSaturation_commandParams.put("saturation",colorControl_moveToHueAndSaturation_saturation_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHueAndSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_moveToHueAndSaturation_commandParams.put("transitionTime",colorControl_moveToHueAndSaturation_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHueAndSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveToHueAndSaturation_commandParams.put("optionsMask",colorControl_moveToHueAndSaturation_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveToHueAndSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveToHueAndSaturation_commandParams.put("optionsOverride",colorControl_moveToHueAndSaturation_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveToHueAndSaturation_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveToHueAndSaturation((DefaultClusterCallback) callback
-                          ,  colorControl_moveToHueAndSaturation_commandParams.get("hue") commandArguments.get("hue")
-                          ,  colorControl_moveToHueAndSaturation_commandParams.get("saturation") commandArguments.get("saturation")
-                          ,  colorControl_moveToHueAndSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_moveToHueAndSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveToHueAndSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveToHueAndSaturation_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveToHueAndSaturation", colorControl_moveToHueAndSaturation_CommandInfo);
-           Map<String, CommandParameter> colorControl_moveToSaturation_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_moveToSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_moveToSaturation_saturation_commandParameter = new CommandParameter("saturation", int.class);
-                 colorControl_moveToSaturation_commandParams.put("saturation",colorControl_moveToSaturation_saturation_commandParameter);
-                  
-                 CommandParameter colorControl_moveToSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_moveToSaturation_commandParams.put("transitionTime",colorControl_moveToSaturation_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_moveToSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_moveToSaturation_commandParams.put("optionsMask",colorControl_moveToSaturation_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_moveToSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_moveToSaturation_commandParams.put("optionsOverride",colorControl_moveToSaturation_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_moveToSaturation_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .moveToSaturation((DefaultClusterCallback) callback
-                          ,  colorControl_moveToSaturation_commandParams.get("saturation") commandArguments.get("saturation")
-                          ,  colorControl_moveToSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_moveToSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_moveToSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_moveToSaturation_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("moveToSaturation", colorControl_moveToSaturation_CommandInfo);
-           Map<String, CommandParameter> colorControl_stepColor_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_stepColor_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_stepColor_stepX_commandParameter = new CommandParameter("stepX", int.class);
-                 colorControl_stepColor_commandParams.put("stepX",colorControl_stepColor_stepX_commandParameter);
-                  
-                 CommandParameter colorControl_stepColor_stepY_commandParameter = new CommandParameter("stepY", int.class);
-                 colorControl_stepColor_commandParams.put("stepY",colorControl_stepColor_stepY_commandParameter);
-                  
-                 CommandParameter colorControl_stepColor_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_stepColor_commandParams.put("transitionTime",colorControl_stepColor_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_stepColor_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_stepColor_commandParams.put("optionsMask",colorControl_stepColor_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_stepColor_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_stepColor_commandParams.put("optionsOverride",colorControl_stepColor_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_stepColor_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .stepColor((DefaultClusterCallback) callback
-                          ,  colorControl_stepColor_commandParams.get("stepX") commandArguments.get("stepX")
-                          ,  colorControl_stepColor_commandParams.get("stepY") commandArguments.get("stepY")
-                          ,  colorControl_stepColor_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_stepColor_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_stepColor_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_stepColor_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("stepColor", colorControl_stepColor_CommandInfo);
-           Map<String, CommandParameter> colorControl_stepColorTemperature_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_stepColorTemperature_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_stepColorTemperature_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("stepMode",colorControl_stepColorTemperature_stepMode_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("stepSize",colorControl_stepColorTemperature_stepSize_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("transitionTime",colorControl_stepColorTemperature_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter = new CommandParameter("colorTemperatureMinimum", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("colorTemperatureMinimum",colorControl_stepColorTemperature_colorTemperatureMinimum_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter = new CommandParameter("colorTemperatureMaximum", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("colorTemperatureMaximum",colorControl_stepColorTemperature_colorTemperatureMaximum_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("optionsMask",colorControl_stepColorTemperature_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_stepColorTemperature_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_stepColorTemperature_commandParams.put("optionsOverride",colorControl_stepColorTemperature_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_stepColorTemperature_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .stepColorTemperature((DefaultClusterCallback) callback
-                          ,  colorControl_stepColorTemperature_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  colorControl_stepColorTemperature_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  colorControl_stepColorTemperature_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_stepColorTemperature_commandParams.get("colorTemperatureMinimum") commandArguments.get("colorTemperatureMinimum")
-                          ,  colorControl_stepColorTemperature_commandParams.get("colorTemperatureMaximum") commandArguments.get("colorTemperatureMaximum")
-                          ,  colorControl_stepColorTemperature_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_stepColorTemperature_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_stepColorTemperature_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("stepColorTemperature", colorControl_stepColorTemperature_CommandInfo);
-           Map<String, CommandParameter> colorControl_stepHue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_stepHue_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_stepHue_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 colorControl_stepHue_commandParams.put("stepMode",colorControl_stepHue_stepMode_commandParameter);
-                  
-                 CommandParameter colorControl_stepHue_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 colorControl_stepHue_commandParams.put("stepSize",colorControl_stepHue_stepSize_commandParameter);
-                  
-                 CommandParameter colorControl_stepHue_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_stepHue_commandParams.put("transitionTime",colorControl_stepHue_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_stepHue_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_stepHue_commandParams.put("optionsMask",colorControl_stepHue_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_stepHue_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_stepHue_commandParams.put("optionsOverride",colorControl_stepHue_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_stepHue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .stepHue((DefaultClusterCallback) callback
-                          ,  colorControl_stepHue_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  colorControl_stepHue_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  colorControl_stepHue_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_stepHue_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_stepHue_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_stepHue_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("stepHue", colorControl_stepHue_CommandInfo);
-           Map<String, CommandParameter> colorControl_stepSaturation_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_stepSaturation_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_stepSaturation_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 colorControl_stepSaturation_commandParams.put("stepMode",colorControl_stepSaturation_stepMode_commandParameter);
-                  
-                 CommandParameter colorControl_stepSaturation_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 colorControl_stepSaturation_commandParams.put("stepSize",colorControl_stepSaturation_stepSize_commandParameter);
-                  
-                 CommandParameter colorControl_stepSaturation_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 colorControl_stepSaturation_commandParams.put("transitionTime",colorControl_stepSaturation_transitionTime_commandParameter);
-                  
-                 CommandParameter colorControl_stepSaturation_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_stepSaturation_commandParams.put("optionsMask",colorControl_stepSaturation_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_stepSaturation_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_stepSaturation_commandParams.put("optionsOverride",colorControl_stepSaturation_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_stepSaturation_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .stepSaturation((DefaultClusterCallback) callback
-                          ,  colorControl_stepSaturation_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  colorControl_stepSaturation_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  colorControl_stepSaturation_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  colorControl_stepSaturation_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_stepSaturation_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_stepSaturation_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("stepSaturation", colorControl_stepSaturation_CommandInfo);
-           Map<String, CommandParameter> colorControl_stopMoveStep_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter colorControl_stopMoveStep_commandParameter = new CommandParameter("ColorControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter colorControl_stopMoveStep_optionsMask_commandParameter = new CommandParameter("optionsMask", int.class);
-                 colorControl_stopMoveStep_commandParams.put("optionsMask",colorControl_stopMoveStep_optionsMask_commandParameter);
-                  
-                 CommandParameter colorControl_stopMoveStep_optionsOverride_commandParameter = new CommandParameter("optionsOverride", int.class);
-                 colorControl_stopMoveStep_commandParams.put("optionsOverride",colorControl_stopMoveStep_optionsOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo colorControl_stopMoveStep_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ColorControlCluster) cluster)
-                          .stopMoveStep((DefaultClusterCallback) callback
-                          ,  colorControl_stopMoveStep_commandParams.get("optionsMask") commandArguments.get("optionsMask")
-                          ,  colorControl_stopMoveStep_commandParams.get("optionsOverride") commandArguments.get("optionsOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   colorControl_stopMoveStep_commandParams
-           );
-           colorControl_ClusterCommandInfo.put("stopMoveStep", colorControl_stopMoveStep_CommandInfo);
-     // Populate cluster
-     ClusterInfo colorControl_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ColorControlCluster(ptr, endpointId), colorControl_ClusterCommandInfo);
-     clusterMap.put("colorControl", colorControl_clusterInfo);
-     Map<String, CommandInfo> contentLauncher_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> contentLauncher_launchContent_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter contentLauncher_launchContent_commandParameter = new CommandParameter("ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback.class);
-                 CommandParameter contentLauncher_launchContent_autoPlay_commandParameter = new CommandParameter("autoPlay", boolean.class);
-                 contentLauncher_launchContent_commandParams.put("autoPlay",contentLauncher_launchContent_autoPlay_commandParameter);
-                  
-                 CommandParameter contentLauncher_launchContent_data_commandParameter = new CommandParameter("data", String.class);
-                 contentLauncher_launchContent_commandParams.put("data",contentLauncher_launchContent_data_commandParameter);
-                 
-           // Populate commands
-           CommandInfo contentLauncher_launchContent_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ContentLauncherCluster) cluster)
-                           .launchContent((ChipClusters.ContentLauncherCluster.LaunchContentResponseCallback) callback
-                           ,  contentLauncher_launchContent_commandParams.get("autoPlay") commandArguments.get("autoPlay")
-                           ,  contentLauncher_launchContent_commandParams.get("data") commandArguments.get("data")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   contentLauncher_launchContent_commandParams
-           );
-           contentLauncher_ClusterCommandInfo.put("launchContent", contentLauncher_launchContent_CommandInfo);
-           Map<String, CommandParameter> contentLauncher_launchURL_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter contentLauncher_launchURL_commandParameter = new CommandParameter("ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
-                 CommandParameter contentLauncher_launchURL_contentURL_commandParameter = new CommandParameter("contentURL", String.class);
-                 contentLauncher_launchURL_commandParams.put("contentURL",contentLauncher_launchURL_contentURL_commandParameter);
-                  
-                 CommandParameter contentLauncher_launchURL_displayString_commandParameter = new CommandParameter("displayString", String.class);
-                 contentLauncher_launchURL_commandParams.put("displayString",contentLauncher_launchURL_displayString_commandParameter);
-                 
-           // Populate commands
-           CommandInfo contentLauncher_launchURL_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ContentLauncherCluster) cluster)
-                           .launchURL((ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback) callback
-                           ,  contentLauncher_launchURL_commandParams.get("contentURL") commandArguments.get("contentURL")
-                           ,  contentLauncher_launchURL_commandParams.get("displayString") commandArguments.get("displayString")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   contentLauncher_launchURL_commandParams
-           );
-           contentLauncher_ClusterCommandInfo.put("launchURL", contentLauncher_launchURL_CommandInfo);
-     // Populate cluster
-     ClusterInfo contentLauncher_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ContentLauncherCluster(ptr, endpointId), contentLauncher_ClusterCommandInfo);
-     clusterMap.put("contentLauncher", contentLauncher_clusterInfo);
-     Map<String, CommandInfo> descriptor_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo descriptor_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.DescriptorCluster(ptr, endpointId), descriptor_ClusterCommandInfo);
-     clusterMap.put("descriptor", descriptor_clusterInfo);
-     Map<String, CommandInfo> diagnosticLogs_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> diagnosticLogs_retrieveLogsRequest_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter diagnosticLogs_retrieveLogsRequest_commandParameter = new CommandParameter("DiagnosticLogs", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter diagnosticLogs_retrieveLogsRequest_intent_commandParameter = new CommandParameter("intent", int.class);
-                 diagnosticLogs_retrieveLogsRequest_commandParams.put("intent",diagnosticLogs_retrieveLogsRequest_intent_commandParameter);
-                  
-                 CommandParameter diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter = new CommandParameter("requestedProtocol", int.class);
-                 diagnosticLogs_retrieveLogsRequest_commandParams.put("requestedProtocol",diagnosticLogs_retrieveLogsRequest_requestedProtocol_commandParameter);
-                  
-                 CommandParameter diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter = new CommandParameter("transferFileDesignator", byte[].class);
-                 diagnosticLogs_retrieveLogsRequest_commandParams.put("transferFileDesignator",diagnosticLogs_retrieveLogsRequest_transferFileDesignator_commandParameter);
-                 
-           // Populate commands
-           CommandInfo diagnosticLogs_retrieveLogsRequest_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DiagnosticLogsCluster) cluster)
-                          .retrieveLogsRequest((DefaultClusterCallback) callback
-                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("intent") commandArguments.get("intent")
-                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("requestedProtocol") commandArguments.get("requestedProtocol")
-                          ,  diagnosticLogs_retrieveLogsRequest_commandParams.get("transferFileDesignator") commandArguments.get("transferFileDesignator")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   diagnosticLogs_retrieveLogsRequest_commandParams
-           );
-           diagnosticLogs_ClusterCommandInfo.put("retrieveLogsRequest", diagnosticLogs_retrieveLogsRequest_CommandInfo);
-     // Populate cluster
-     ClusterInfo diagnosticLogs_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.DiagnosticLogsCluster(ptr, endpointId), diagnosticLogs_ClusterCommandInfo);
-     clusterMap.put("diagnosticLogs", diagnosticLogs_clusterInfo);
-     Map<String, CommandInfo> doorLock_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> doorLock_clearAllPins_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearAllPins_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
-           // Populate commands
-           CommandInfo doorLock_clearAllPins_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearAllPins((ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearAllPins_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearAllPins", doorLock_clearAllPins_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearAllRfids_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearAllRfids_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
-           // Populate commands
-           CommandInfo doorLock_clearAllRfids_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearAllRfids((ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearAllRfids_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearAllRfids", doorLock_clearAllRfids_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
-                 CommandParameter doorLock_clearHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_clearHolidaySchedule_commandParams.put("scheduleId",doorLock_clearHolidaySchedule_scheduleId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_clearHolidaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearHolidaySchedule((ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback) callback
-                           ,  doorLock_clearHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearHolidaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearHolidaySchedule", doorLock_clearHolidaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearPin_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
-                 CommandParameter doorLock_clearPin_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_clearPin_commandParams.put("userId",doorLock_clearPin_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_clearPin_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearPin((ChipClusters.DoorLockCluster.ClearPinResponseCallback) callback
-                           ,  doorLock_clearPin_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearPin_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearPin", doorLock_clearPin_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearRfid_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
-                 CommandParameter doorLock_clearRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_clearRfid_commandParams.put("userId",doorLock_clearRfid_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_clearRfid_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearRfid((ChipClusters.DoorLockCluster.ClearRfidResponseCallback) callback
-                           ,  doorLock_clearRfid_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearRfid_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearRfid", doorLock_clearRfid_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
-                 CommandParameter doorLock_clearWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_clearWeekdaySchedule_commandParams.put("scheduleId",doorLock_clearWeekdaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_clearWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_clearWeekdaySchedule_commandParams.put("userId",doorLock_clearWeekdaySchedule_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_clearWeekdaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearWeekdaySchedule((ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback) callback
-                           ,  doorLock_clearWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_clearWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearWeekdaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearWeekdaySchedule", doorLock_clearWeekdaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_clearYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_clearYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
-                 CommandParameter doorLock_clearYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_clearYeardaySchedule_commandParams.put("scheduleId",doorLock_clearYeardaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_clearYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_clearYeardaySchedule_commandParams.put("userId",doorLock_clearYeardaySchedule_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_clearYeardaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .clearYeardaySchedule((ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback) callback
-                           ,  doorLock_clearYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_clearYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_clearYeardaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("clearYeardaySchedule", doorLock_clearYeardaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_getHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
-                 CommandParameter doorLock_getHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_getHolidaySchedule_commandParams.put("scheduleId",doorLock_getHolidaySchedule_scheduleId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getHolidaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getHolidaySchedule((ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback) callback
-                           ,  doorLock_getHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getHolidaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getHolidaySchedule", doorLock_getHolidaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_getLogRecord_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getLogRecord_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
-                 CommandParameter doorLock_getLogRecord_logIndex_commandParameter = new CommandParameter("logIndex", int.class);
-                 doorLock_getLogRecord_commandParams.put("logIndex",doorLock_getLogRecord_logIndex_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getLogRecord_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getLogRecord((ChipClusters.DoorLockCluster.GetLogRecordResponseCallback) callback
-                           ,  doorLock_getLogRecord_commandParams.get("logIndex") commandArguments.get("logIndex")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getLogRecord_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getLogRecord", doorLock_getLogRecord_CommandInfo);
-           Map<String, CommandParameter> doorLock_getPin_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
-                 CommandParameter doorLock_getPin_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_getPin_commandParams.put("userId",doorLock_getPin_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getPin_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getPin((ChipClusters.DoorLockCluster.GetPinResponseCallback) callback
-                           ,  doorLock_getPin_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getPin_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getPin", doorLock_getPin_CommandInfo);
-           Map<String, CommandParameter> doorLock_getRfid_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
-                 CommandParameter doorLock_getRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_getRfid_commandParams.put("userId",doorLock_getRfid_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getRfid_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getRfid((ChipClusters.DoorLockCluster.GetRfidResponseCallback) callback
-                           ,  doorLock_getRfid_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getRfid_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getRfid", doorLock_getRfid_CommandInfo);
-           Map<String, CommandParameter> doorLock_getUserType_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getUserType_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
-                 CommandParameter doorLock_getUserType_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_getUserType_commandParams.put("userId",doorLock_getUserType_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getUserType_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getUserType((ChipClusters.DoorLockCluster.GetUserTypeResponseCallback) callback
-                           ,  doorLock_getUserType_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getUserType_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getUserType", doorLock_getUserType_CommandInfo);
-           Map<String, CommandParameter> doorLock_getWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
-                 CommandParameter doorLock_getWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_getWeekdaySchedule_commandParams.put("scheduleId",doorLock_getWeekdaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_getWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_getWeekdaySchedule_commandParams.put("userId",doorLock_getWeekdaySchedule_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getWeekdaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getWeekdaySchedule((ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback) callback
-                           ,  doorLock_getWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_getWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getWeekdaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getWeekdaySchedule", doorLock_getWeekdaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_getYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_getYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
-                 CommandParameter doorLock_getYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_getYeardaySchedule_commandParams.put("scheduleId",doorLock_getYeardaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_getYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_getYeardaySchedule_commandParams.put("userId",doorLock_getYeardaySchedule_userId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_getYeardaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .getYeardaySchedule((ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback) callback
-                           ,  doorLock_getYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_getYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_getYeardaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("getYeardaySchedule", doorLock_getYeardaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_lockDoor_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_lockDoor_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
-                 CommandParameter doorLock_lockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-                 doorLock_lockDoor_commandParams.put("pin",doorLock_lockDoor_pin_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_lockDoor_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .lockDoor((ChipClusters.DoorLockCluster.LockDoorResponseCallback) callback
-                           ,  doorLock_lockDoor_commandParams.get("pin") commandArguments.get("pin")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_lockDoor_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("lockDoor", doorLock_lockDoor_CommandInfo);
-           Map<String, CommandParameter> doorLock_setHolidaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setHolidaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
-                 CommandParameter doorLock_setHolidaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_setHolidaySchedule_commandParams.put("scheduleId",doorLock_setHolidaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_setHolidaySchedule_localStartTime_commandParameter = new CommandParameter("localStartTime", long.class);
-                 doorLock_setHolidaySchedule_commandParams.put("localStartTime",doorLock_setHolidaySchedule_localStartTime_commandParameter);
-                  
-                 CommandParameter doorLock_setHolidaySchedule_localEndTime_commandParameter = new CommandParameter("localEndTime", long.class);
-                 doorLock_setHolidaySchedule_commandParams.put("localEndTime",doorLock_setHolidaySchedule_localEndTime_commandParameter);
-                  
-                 CommandParameter doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter = new CommandParameter("operatingModeDuringHoliday", int.class);
-                 doorLock_setHolidaySchedule_commandParams.put("operatingModeDuringHoliday",doorLock_setHolidaySchedule_operatingModeDuringHoliday_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setHolidaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setHolidaySchedule((ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback) callback
-                           ,  doorLock_setHolidaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_setHolidaySchedule_commandParams.get("localStartTime") commandArguments.get("localStartTime")
-                           ,  doorLock_setHolidaySchedule_commandParams.get("localEndTime") commandArguments.get("localEndTime")
-                           ,  doorLock_setHolidaySchedule_commandParams.get("operatingModeDuringHoliday") commandArguments.get("operatingModeDuringHoliday")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setHolidaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setHolidaySchedule", doorLock_setHolidaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_setPin_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setPin_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
-                 CommandParameter doorLock_setPin_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_setPin_commandParams.put("userId",doorLock_setPin_userId_commandParameter);
-                  
-                 CommandParameter doorLock_setPin_userStatus_commandParameter = new CommandParameter("userStatus", int.class);
-                 doorLock_setPin_commandParams.put("userStatus",doorLock_setPin_userStatus_commandParameter);
-                  
-                 CommandParameter doorLock_setPin_userType_commandParameter = new CommandParameter("userType", int.class);
-                 doorLock_setPin_commandParams.put("userType",doorLock_setPin_userType_commandParameter);
-                  
-                 CommandParameter doorLock_setPin_pin_commandParameter = new CommandParameter("pin", byte[].class);
-                 doorLock_setPin_commandParams.put("pin",doorLock_setPin_pin_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setPin_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setPin((ChipClusters.DoorLockCluster.SetPinResponseCallback) callback
-                           ,  doorLock_setPin_commandParams.get("userId") commandArguments.get("userId")
-                           ,  doorLock_setPin_commandParams.get("userStatus") commandArguments.get("userStatus")
-                           ,  doorLock_setPin_commandParams.get("userType") commandArguments.get("userType")
-                           ,  doorLock_setPin_commandParams.get("pin") commandArguments.get("pin")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setPin_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setPin", doorLock_setPin_CommandInfo);
-           Map<String, CommandParameter> doorLock_setRfid_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setRfid_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
-                 CommandParameter doorLock_setRfid_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_setRfid_commandParams.put("userId",doorLock_setRfid_userId_commandParameter);
-                  
-                 CommandParameter doorLock_setRfid_userStatus_commandParameter = new CommandParameter("userStatus", int.class);
-                 doorLock_setRfid_commandParams.put("userStatus",doorLock_setRfid_userStatus_commandParameter);
-                  
-                 CommandParameter doorLock_setRfid_userType_commandParameter = new CommandParameter("userType", int.class);
-                 doorLock_setRfid_commandParams.put("userType",doorLock_setRfid_userType_commandParameter);
-                  
-                 CommandParameter doorLock_setRfid_id_commandParameter = new CommandParameter("id", byte[].class);
-                 doorLock_setRfid_commandParams.put("id",doorLock_setRfid_id_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setRfid_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setRfid((ChipClusters.DoorLockCluster.SetRfidResponseCallback) callback
-                           ,  doorLock_setRfid_commandParams.get("userId") commandArguments.get("userId")
-                           ,  doorLock_setRfid_commandParams.get("userStatus") commandArguments.get("userStatus")
-                           ,  doorLock_setRfid_commandParams.get("userType") commandArguments.get("userType")
-                           ,  doorLock_setRfid_commandParams.get("id") commandArguments.get("id")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setRfid_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setRfid", doorLock_setRfid_CommandInfo);
-           Map<String, CommandParameter> doorLock_setUserType_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setUserType_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
-                 CommandParameter doorLock_setUserType_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_setUserType_commandParams.put("userId",doorLock_setUserType_userId_commandParameter);
-                  
-                 CommandParameter doorLock_setUserType_userType_commandParameter = new CommandParameter("userType", int.class);
-                 doorLock_setUserType_commandParams.put("userType",doorLock_setUserType_userType_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setUserType_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setUserType((ChipClusters.DoorLockCluster.SetUserTypeResponseCallback) callback
-                           ,  doorLock_setUserType_commandParams.get("userId") commandArguments.get("userId")
-                           ,  doorLock_setUserType_commandParams.get("userType") commandArguments.get("userType")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setUserType_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setUserType", doorLock_setUserType_CommandInfo);
-           Map<String, CommandParameter> doorLock_setWeekdaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setWeekdaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
-                 CommandParameter doorLock_setWeekdaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("scheduleId",doorLock_setWeekdaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("userId",doorLock_setWeekdaySchedule_userId_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_daysMask_commandParameter = new CommandParameter("daysMask", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("daysMask",doorLock_setWeekdaySchedule_daysMask_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_startHour_commandParameter = new CommandParameter("startHour", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("startHour",doorLock_setWeekdaySchedule_startHour_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_startMinute_commandParameter = new CommandParameter("startMinute", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("startMinute",doorLock_setWeekdaySchedule_startMinute_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_endHour_commandParameter = new CommandParameter("endHour", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("endHour",doorLock_setWeekdaySchedule_endHour_commandParameter);
-                  
-                 CommandParameter doorLock_setWeekdaySchedule_endMinute_commandParameter = new CommandParameter("endMinute", int.class);
-                 doorLock_setWeekdaySchedule_commandParams.put("endMinute",doorLock_setWeekdaySchedule_endMinute_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setWeekdaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setWeekdaySchedule((ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback) callback
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("daysMask") commandArguments.get("daysMask")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("startHour") commandArguments.get("startHour")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("startMinute") commandArguments.get("startMinute")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("endHour") commandArguments.get("endHour")
-                           ,  doorLock_setWeekdaySchedule_commandParams.get("endMinute") commandArguments.get("endMinute")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setWeekdaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setWeekdaySchedule", doorLock_setWeekdaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_setYeardaySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_setYeardaySchedule_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
-                 CommandParameter doorLock_setYeardaySchedule_scheduleId_commandParameter = new CommandParameter("scheduleId", int.class);
-                 doorLock_setYeardaySchedule_commandParams.put("scheduleId",doorLock_setYeardaySchedule_scheduleId_commandParameter);
-                  
-                 CommandParameter doorLock_setYeardaySchedule_userId_commandParameter = new CommandParameter("userId", int.class);
-                 doorLock_setYeardaySchedule_commandParams.put("userId",doorLock_setYeardaySchedule_userId_commandParameter);
-                  
-                 CommandParameter doorLock_setYeardaySchedule_localStartTime_commandParameter = new CommandParameter("localStartTime", long.class);
-                 doorLock_setYeardaySchedule_commandParams.put("localStartTime",doorLock_setYeardaySchedule_localStartTime_commandParameter);
-                  
-                 CommandParameter doorLock_setYeardaySchedule_localEndTime_commandParameter = new CommandParameter("localEndTime", long.class);
-                 doorLock_setYeardaySchedule_commandParams.put("localEndTime",doorLock_setYeardaySchedule_localEndTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_setYeardaySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .setYeardaySchedule((ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback) callback
-                           ,  doorLock_setYeardaySchedule_commandParams.get("scheduleId") commandArguments.get("scheduleId")
-                           ,  doorLock_setYeardaySchedule_commandParams.get("userId") commandArguments.get("userId")
-                           ,  doorLock_setYeardaySchedule_commandParams.get("localStartTime") commandArguments.get("localStartTime")
-                           ,  doorLock_setYeardaySchedule_commandParams.get("localEndTime") commandArguments.get("localEndTime")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_setYeardaySchedule_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("setYeardaySchedule", doorLock_setYeardaySchedule_CommandInfo);
-           Map<String, CommandParameter> doorLock_unlockDoor_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_unlockDoor_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
-                 CommandParameter doorLock_unlockDoor_pin_commandParameter = new CommandParameter("pin", byte[].class);
-                 doorLock_unlockDoor_commandParams.put("pin",doorLock_unlockDoor_pin_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_unlockDoor_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .unlockDoor((ChipClusters.DoorLockCluster.UnlockDoorResponseCallback) callback
-                           ,  doorLock_unlockDoor_commandParams.get("pin") commandArguments.get("pin")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_unlockDoor_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("unlockDoor", doorLock_unlockDoor_CommandInfo);
-           Map<String, CommandParameter> doorLock_unlockWithTimeout_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter doorLock_unlockWithTimeout_commandParameter = new CommandParameter("DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
-                 CommandParameter doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter = new CommandParameter("timeoutInSeconds", int.class);
-                 doorLock_unlockWithTimeout_commandParams.put("timeoutInSeconds",doorLock_unlockWithTimeout_timeoutInSeconds_commandParameter);
-                  
-                 CommandParameter doorLock_unlockWithTimeout_pin_commandParameter = new CommandParameter("pin", byte[].class);
-                 doorLock_unlockWithTimeout_commandParams.put("pin",doorLock_unlockWithTimeout_pin_commandParameter);
-                 
-           // Populate commands
-           CommandInfo doorLock_unlockWithTimeout_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.DoorLockCluster) cluster)
-                           .unlockWithTimeout((ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback) callback
-                           ,  doorLock_unlockWithTimeout_commandParams.get("timeoutInSeconds") commandArguments.get("timeoutInSeconds")
-                           ,  doorLock_unlockWithTimeout_commandParams.get("pin") commandArguments.get("pin")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   doorLock_unlockWithTimeout_commandParams
-           );
-           doorLock_ClusterCommandInfo.put("unlockWithTimeout", doorLock_unlockWithTimeout_CommandInfo);
-     // Populate cluster
-     ClusterInfo doorLock_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.DoorLockCluster(ptr, endpointId), doorLock_ClusterCommandInfo);
-     clusterMap.put("doorLock", doorLock_clusterInfo);
-     Map<String, CommandInfo> electricalMeasurement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo electricalMeasurement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ElectricalMeasurementCluster(ptr, endpointId), electricalMeasurement_ClusterCommandInfo);
-     clusterMap.put("electricalMeasurement", electricalMeasurement_clusterInfo);
-     Map<String, CommandInfo> ethernetNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> ethernetNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter ethernetNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo ethernetNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.EthernetNetworkDiagnosticsCluster) cluster)
-                          .resetCounts((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   ethernetNetworkDiagnostics_resetCounts_commandParams
-           );
-           ethernetNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", ethernetNetworkDiagnostics_resetCounts_CommandInfo);
-     // Populate cluster
-     ClusterInfo ethernetNetworkDiagnostics_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.EthernetNetworkDiagnosticsCluster(ptr, endpointId), ethernetNetworkDiagnostics_ClusterCommandInfo);
-     clusterMap.put("ethernetNetworkDiagnostics", ethernetNetworkDiagnostics_clusterInfo);
-     Map<String, CommandInfo> fixedLabel_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo fixedLabel_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.FixedLabelCluster(ptr, endpointId), fixedLabel_ClusterCommandInfo);
-     clusterMap.put("fixedLabel", fixedLabel_clusterInfo);
-     Map<String, CommandInfo> flowMeasurement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo flowMeasurement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.FlowMeasurementCluster(ptr, endpointId), flowMeasurement_ClusterCommandInfo);
-     clusterMap.put("flowMeasurement", flowMeasurement_clusterInfo);
-     Map<String, CommandInfo> generalCommissioning_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> generalCommissioning_armFailSafe_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter generalCommissioning_armFailSafe_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback.class);
-                 CommandParameter generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter = new CommandParameter("expiryLengthSeconds", int.class);
-                 generalCommissioning_armFailSafe_commandParams.put("expiryLengthSeconds",generalCommissioning_armFailSafe_expiryLengthSeconds_commandParameter);
-                  
-                 CommandParameter generalCommissioning_armFailSafe_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 generalCommissioning_armFailSafe_commandParams.put("breadcrumb",generalCommissioning_armFailSafe_breadcrumb_commandParameter);
-                  
-                 CommandParameter generalCommissioning_armFailSafe_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 generalCommissioning_armFailSafe_commandParams.put("timeoutMs",generalCommissioning_armFailSafe_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo generalCommissioning_armFailSafe_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GeneralCommissioningCluster) cluster)
-                           .armFailSafe((ChipClusters.GeneralCommissioningCluster.ArmFailSafeResponseCallback) callback
-                           ,  generalCommissioning_armFailSafe_commandParams.get("expiryLengthSeconds") commandArguments.get("expiryLengthSeconds")
-                           ,  generalCommissioning_armFailSafe_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  generalCommissioning_armFailSafe_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   generalCommissioning_armFailSafe_commandParams
-           );
-           generalCommissioning_ClusterCommandInfo.put("armFailSafe", generalCommissioning_armFailSafe_CommandInfo);
-           Map<String, CommandParameter> generalCommissioning_commissioningComplete_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter generalCommissioning_commissioningComplete_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback.class);
-           // Populate commands
-           CommandInfo generalCommissioning_commissioningComplete_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GeneralCommissioningCluster) cluster)
-                           .commissioningComplete((ChipClusters.GeneralCommissioningCluster.CommissioningCompleteResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   generalCommissioning_commissioningComplete_commandParams
-           );
-           generalCommissioning_ClusterCommandInfo.put("commissioningComplete", generalCommissioning_commissioningComplete_CommandInfo);
-           Map<String, CommandParameter> generalCommissioning_setRegulatoryConfig_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter generalCommissioning_setRegulatoryConfig_commandParameter = new CommandParameter("GeneralCommissioning", ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback.class);
-                 CommandParameter generalCommissioning_setRegulatoryConfig_location_commandParameter = new CommandParameter("location", int.class);
-                 generalCommissioning_setRegulatoryConfig_commandParams.put("location",generalCommissioning_setRegulatoryConfig_location_commandParameter);
-                  
-                 CommandParameter generalCommissioning_setRegulatoryConfig_countryCode_commandParameter = new CommandParameter("countryCode", String.class);
-                 generalCommissioning_setRegulatoryConfig_commandParams.put("countryCode",generalCommissioning_setRegulatoryConfig_countryCode_commandParameter);
-                  
-                 CommandParameter generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 generalCommissioning_setRegulatoryConfig_commandParams.put("breadcrumb",generalCommissioning_setRegulatoryConfig_breadcrumb_commandParameter);
-                  
-                 CommandParameter generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 generalCommissioning_setRegulatoryConfig_commandParams.put("timeoutMs",generalCommissioning_setRegulatoryConfig_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo generalCommissioning_setRegulatoryConfig_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GeneralCommissioningCluster) cluster)
-                           .setRegulatoryConfig((ChipClusters.GeneralCommissioningCluster.SetRegulatoryConfigResponseCallback) callback
-                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("location") commandArguments.get("location")
-                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("countryCode") commandArguments.get("countryCode")
-                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  generalCommissioning_setRegulatoryConfig_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   generalCommissioning_setRegulatoryConfig_commandParams
-           );
-           generalCommissioning_ClusterCommandInfo.put("setRegulatoryConfig", generalCommissioning_setRegulatoryConfig_CommandInfo);
-     // Populate cluster
-     ClusterInfo generalCommissioning_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.GeneralCommissioningCluster(ptr, endpointId), generalCommissioning_ClusterCommandInfo);
-     clusterMap.put("generalCommissioning", generalCommissioning_clusterInfo);
-     Map<String, CommandInfo> generalDiagnostics_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo generalDiagnostics_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.GeneralDiagnosticsCluster(ptr, endpointId), generalDiagnostics_ClusterCommandInfo);
-     clusterMap.put("generalDiagnostics", generalDiagnostics_clusterInfo);
-     Map<String, CommandInfo> groupKeyManagement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo groupKeyManagement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.GroupKeyManagementCluster(ptr, endpointId), groupKeyManagement_ClusterCommandInfo);
-     clusterMap.put("groupKeyManagement", groupKeyManagement_clusterInfo);
-     Map<String, CommandInfo> groups_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> groups_addGroup_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_addGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
-                 CommandParameter groups_addGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 groups_addGroup_commandParams.put("groupId",groups_addGroup_groupId_commandParameter);
-                  
-                 CommandParameter groups_addGroup_groupName_commandParameter = new CommandParameter("groupName", String.class);
-                 groups_addGroup_commandParams.put("groupName",groups_addGroup_groupName_commandParameter);
-                 
-           // Populate commands
-           CommandInfo groups_addGroup_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                           .addGroup((ChipClusters.GroupsCluster.AddGroupResponseCallback) callback
-                           ,  groups_addGroup_commandParams.get("groupId") commandArguments.get("groupId")
-                           ,  groups_addGroup_commandParams.get("groupName") commandArguments.get("groupName")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_addGroup_commandParams
-           );
-           groups_ClusterCommandInfo.put("addGroup", groups_addGroup_CommandInfo);
-           Map<String, CommandParameter> groups_addGroupIfIdentifying_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_addGroupIfIdentifying_commandParameter = new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter groups_addGroupIfIdentifying_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 groups_addGroupIfIdentifying_commandParams.put("groupId",groups_addGroupIfIdentifying_groupId_commandParameter);
-                  
-                 CommandParameter groups_addGroupIfIdentifying_groupName_commandParameter = new CommandParameter("groupName", String.class);
-                 groups_addGroupIfIdentifying_commandParams.put("groupName",groups_addGroupIfIdentifying_groupName_commandParameter);
-                 
-           // Populate commands
-           CommandInfo groups_addGroupIfIdentifying_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                          .addGroupIfIdentifying((DefaultClusterCallback) callback
-                          ,  groups_addGroupIfIdentifying_commandParams.get("groupId") commandArguments.get("groupId")
-                          ,  groups_addGroupIfIdentifying_commandParams.get("groupName") commandArguments.get("groupName")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_addGroupIfIdentifying_commandParams
-           );
-           groups_ClusterCommandInfo.put("addGroupIfIdentifying", groups_addGroupIfIdentifying_CommandInfo);
-           Map<String, CommandParameter> groups_getGroupMembership_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_getGroupMembership_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
-                 CommandParameter groups_getGroupMembership_groupCount_commandParameter = new CommandParameter("groupCount", int.class);
-                 groups_getGroupMembership_commandParams.put("groupCount",groups_getGroupMembership_groupCount_commandParameter);
-                  
-                 CommandParameter groups_getGroupMembership_groupList_commandParameter = new CommandParameter("groupList", int.class);
-                 groups_getGroupMembership_commandParams.put("groupList",groups_getGroupMembership_groupList_commandParameter);
-                 
-           // Populate commands
-           CommandInfo groups_getGroupMembership_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                           .getGroupMembership((ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback) callback
-                           ,  groups_getGroupMembership_commandParams.get("groupCount") commandArguments.get("groupCount")
-                           ,  groups_getGroupMembership_commandParams.get("groupList") commandArguments.get("groupList")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_getGroupMembership_commandParams
-           );
-           groups_ClusterCommandInfo.put("getGroupMembership", groups_getGroupMembership_CommandInfo);
-           Map<String, CommandParameter> groups_removeAllGroups_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_removeAllGroups_commandParameter = new CommandParameter("Groups", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo groups_removeAllGroups_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                          .removeAllGroups((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_removeAllGroups_commandParams
-           );
-           groups_ClusterCommandInfo.put("removeAllGroups", groups_removeAllGroups_CommandInfo);
-           Map<String, CommandParameter> groups_removeGroup_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_removeGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
-                 CommandParameter groups_removeGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 groups_removeGroup_commandParams.put("groupId",groups_removeGroup_groupId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo groups_removeGroup_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                           .removeGroup((ChipClusters.GroupsCluster.RemoveGroupResponseCallback) callback
-                           ,  groups_removeGroup_commandParams.get("groupId") commandArguments.get("groupId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_removeGroup_commandParams
-           );
-           groups_ClusterCommandInfo.put("removeGroup", groups_removeGroup_CommandInfo);
-           Map<String, CommandParameter> groups_viewGroup_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter groups_viewGroup_commandParameter = new CommandParameter("Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
-                 CommandParameter groups_viewGroup_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 groups_viewGroup_commandParams.put("groupId",groups_viewGroup_groupId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo groups_viewGroup_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.GroupsCluster) cluster)
-                           .viewGroup((ChipClusters.GroupsCluster.ViewGroupResponseCallback) callback
-                           ,  groups_viewGroup_commandParams.get("groupId") commandArguments.get("groupId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   groups_viewGroup_commandParams
-           );
-           groups_ClusterCommandInfo.put("viewGroup", groups_viewGroup_CommandInfo);
-     // Populate cluster
-     ClusterInfo groups_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.GroupsCluster(ptr, endpointId), groups_ClusterCommandInfo);
-     clusterMap.put("groups", groups_clusterInfo);
-     Map<String, CommandInfo> identify_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> identify_identify_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter identify_identify_commandParameter = new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter identify_identify_identifyTime_commandParameter = new CommandParameter("identifyTime", int.class);
-                 identify_identify_commandParams.put("identifyTime",identify_identify_identifyTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo identify_identify_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.IdentifyCluster) cluster)
-                          .identify((DefaultClusterCallback) callback
-                          ,  identify_identify_commandParams.get("identifyTime") commandArguments.get("identifyTime")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   identify_identify_commandParams
-           );
-           identify_ClusterCommandInfo.put("identify", identify_identify_CommandInfo);
-           Map<String, CommandParameter> identify_identifyQuery_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter identify_identifyQuery_commandParameter = new CommandParameter("Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
-           // Populate commands
-           CommandInfo identify_identifyQuery_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.IdentifyCluster) cluster)
-                           .identifyQuery((ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   identify_identifyQuery_commandParams
-           );
-           identify_ClusterCommandInfo.put("identifyQuery", identify_identifyQuery_CommandInfo);
-           Map<String, CommandParameter> identify_triggerEffect_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter identify_triggerEffect_commandParameter = new CommandParameter("Identify", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter identify_triggerEffect_effectIdentifier_commandParameter = new CommandParameter("effectIdentifier", int.class);
-                 identify_triggerEffect_commandParams.put("effectIdentifier",identify_triggerEffect_effectIdentifier_commandParameter);
-                  
-                 CommandParameter identify_triggerEffect_effectVariant_commandParameter = new CommandParameter("effectVariant", int.class);
-                 identify_triggerEffect_commandParams.put("effectVariant",identify_triggerEffect_effectVariant_commandParameter);
-                 
-           // Populate commands
-           CommandInfo identify_triggerEffect_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.IdentifyCluster) cluster)
-                          .triggerEffect((DefaultClusterCallback) callback
-                          ,  identify_triggerEffect_commandParams.get("effectIdentifier") commandArguments.get("effectIdentifier")
-                          ,  identify_triggerEffect_commandParams.get("effectVariant") commandArguments.get("effectVariant")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   identify_triggerEffect_commandParams
-           );
-           identify_ClusterCommandInfo.put("triggerEffect", identify_triggerEffect_CommandInfo);
-     // Populate cluster
-     ClusterInfo identify_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.IdentifyCluster(ptr, endpointId), identify_ClusterCommandInfo);
-     clusterMap.put("identify", identify_clusterInfo);
-     Map<String, CommandInfo> keypadInput_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> keypadInput_sendKey_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter keypadInput_sendKey_commandParameter = new CommandParameter("KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
-                 CommandParameter keypadInput_sendKey_keyCode_commandParameter = new CommandParameter("keyCode", int.class);
-                 keypadInput_sendKey_commandParams.put("keyCode",keypadInput_sendKey_keyCode_commandParameter);
-                 
-           // Populate commands
-           CommandInfo keypadInput_sendKey_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.KeypadInputCluster) cluster)
-                           .sendKey((ChipClusters.KeypadInputCluster.SendKeyResponseCallback) callback
-                           ,  keypadInput_sendKey_commandParams.get("keyCode") commandArguments.get("keyCode")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   keypadInput_sendKey_commandParams
-           );
-           keypadInput_ClusterCommandInfo.put("sendKey", keypadInput_sendKey_CommandInfo);
-     // Populate cluster
-     ClusterInfo keypadInput_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.KeypadInputCluster(ptr, endpointId), keypadInput_ClusterCommandInfo);
-     clusterMap.put("keypadInput", keypadInput_clusterInfo);
-     Map<String, CommandInfo> levelControl_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> levelControl_move_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_move_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_move_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 levelControl_move_commandParams.put("moveMode",levelControl_move_moveMode_commandParameter);
-                  
-                 CommandParameter levelControl_move_rate_commandParameter = new CommandParameter("rate", int.class);
-                 levelControl_move_commandParams.put("rate",levelControl_move_rate_commandParameter);
-                  
-                 CommandParameter levelControl_move_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-                 levelControl_move_commandParams.put("optionMask",levelControl_move_optionMask_commandParameter);
-                  
-                 CommandParameter levelControl_move_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
-                 levelControl_move_commandParams.put("optionOverride",levelControl_move_optionOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_move_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .move((DefaultClusterCallback) callback
-                          ,  levelControl_move_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  levelControl_move_commandParams.get("rate") commandArguments.get("rate")
-                          ,  levelControl_move_commandParams.get("optionMask") commandArguments.get("optionMask")
-                          ,  levelControl_move_commandParams.get("optionOverride") commandArguments.get("optionOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_move_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("move", levelControl_move_CommandInfo);
-           Map<String, CommandParameter> levelControl_moveToLevel_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_moveToLevel_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_moveToLevel_level_commandParameter = new CommandParameter("level", int.class);
-                 levelControl_moveToLevel_commandParams.put("level",levelControl_moveToLevel_level_commandParameter);
-                  
-                 CommandParameter levelControl_moveToLevel_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 levelControl_moveToLevel_commandParams.put("transitionTime",levelControl_moveToLevel_transitionTime_commandParameter);
-                  
-                 CommandParameter levelControl_moveToLevel_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-                 levelControl_moveToLevel_commandParams.put("optionMask",levelControl_moveToLevel_optionMask_commandParameter);
-                  
-                 CommandParameter levelControl_moveToLevel_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
-                 levelControl_moveToLevel_commandParams.put("optionOverride",levelControl_moveToLevel_optionOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_moveToLevel_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .moveToLevel((DefaultClusterCallback) callback
-                          ,  levelControl_moveToLevel_commandParams.get("level") commandArguments.get("level")
-                          ,  levelControl_moveToLevel_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  levelControl_moveToLevel_commandParams.get("optionMask") commandArguments.get("optionMask")
-                          ,  levelControl_moveToLevel_commandParams.get("optionOverride") commandArguments.get("optionOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_moveToLevel_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("moveToLevel", levelControl_moveToLevel_CommandInfo);
-           Map<String, CommandParameter> levelControl_moveToLevelWithOnOff_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_moveToLevelWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_moveToLevelWithOnOff_level_commandParameter = new CommandParameter("level", int.class);
-                 levelControl_moveToLevelWithOnOff_commandParams.put("level",levelControl_moveToLevelWithOnOff_level_commandParameter);
-                  
-                 CommandParameter levelControl_moveToLevelWithOnOff_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 levelControl_moveToLevelWithOnOff_commandParams.put("transitionTime",levelControl_moveToLevelWithOnOff_transitionTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_moveToLevelWithOnOff_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .moveToLevelWithOnOff((DefaultClusterCallback) callback
-                          ,  levelControl_moveToLevelWithOnOff_commandParams.get("level") commandArguments.get("level")
-                          ,  levelControl_moveToLevelWithOnOff_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_moveToLevelWithOnOff_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("moveToLevelWithOnOff", levelControl_moveToLevelWithOnOff_CommandInfo);
-           Map<String, CommandParameter> levelControl_moveWithOnOff_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_moveWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_moveWithOnOff_moveMode_commandParameter = new CommandParameter("moveMode", int.class);
-                 levelControl_moveWithOnOff_commandParams.put("moveMode",levelControl_moveWithOnOff_moveMode_commandParameter);
-                  
-                 CommandParameter levelControl_moveWithOnOff_rate_commandParameter = new CommandParameter("rate", int.class);
-                 levelControl_moveWithOnOff_commandParams.put("rate",levelControl_moveWithOnOff_rate_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_moveWithOnOff_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .moveWithOnOff((DefaultClusterCallback) callback
-                          ,  levelControl_moveWithOnOff_commandParams.get("moveMode") commandArguments.get("moveMode")
-                          ,  levelControl_moveWithOnOff_commandParams.get("rate") commandArguments.get("rate")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_moveWithOnOff_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("moveWithOnOff", levelControl_moveWithOnOff_CommandInfo);
-           Map<String, CommandParameter> levelControl_step_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_step_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_step_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 levelControl_step_commandParams.put("stepMode",levelControl_step_stepMode_commandParameter);
-                  
-                 CommandParameter levelControl_step_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 levelControl_step_commandParams.put("stepSize",levelControl_step_stepSize_commandParameter);
-                  
-                 CommandParameter levelControl_step_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 levelControl_step_commandParams.put("transitionTime",levelControl_step_transitionTime_commandParameter);
-                  
-                 CommandParameter levelControl_step_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-                 levelControl_step_commandParams.put("optionMask",levelControl_step_optionMask_commandParameter);
-                  
-                 CommandParameter levelControl_step_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
-                 levelControl_step_commandParams.put("optionOverride",levelControl_step_optionOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_step_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .step((DefaultClusterCallback) callback
-                          ,  levelControl_step_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  levelControl_step_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  levelControl_step_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                          ,  levelControl_step_commandParams.get("optionMask") commandArguments.get("optionMask")
-                          ,  levelControl_step_commandParams.get("optionOverride") commandArguments.get("optionOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_step_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("step", levelControl_step_CommandInfo);
-           Map<String, CommandParameter> levelControl_stepWithOnOff_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_stepWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_stepWithOnOff_stepMode_commandParameter = new CommandParameter("stepMode", int.class);
-                 levelControl_stepWithOnOff_commandParams.put("stepMode",levelControl_stepWithOnOff_stepMode_commandParameter);
-                  
-                 CommandParameter levelControl_stepWithOnOff_stepSize_commandParameter = new CommandParameter("stepSize", int.class);
-                 levelControl_stepWithOnOff_commandParams.put("stepSize",levelControl_stepWithOnOff_stepSize_commandParameter);
-                  
-                 CommandParameter levelControl_stepWithOnOff_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 levelControl_stepWithOnOff_commandParams.put("transitionTime",levelControl_stepWithOnOff_transitionTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_stepWithOnOff_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .stepWithOnOff((DefaultClusterCallback) callback
-                          ,  levelControl_stepWithOnOff_commandParams.get("stepMode") commandArguments.get("stepMode")
-                          ,  levelControl_stepWithOnOff_commandParams.get("stepSize") commandArguments.get("stepSize")
-                          ,  levelControl_stepWithOnOff_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_stepWithOnOff_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("stepWithOnOff", levelControl_stepWithOnOff_CommandInfo);
-           Map<String, CommandParameter> levelControl_stop_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_stop_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter levelControl_stop_optionMask_commandParameter = new CommandParameter("optionMask", int.class);
-                 levelControl_stop_commandParams.put("optionMask",levelControl_stop_optionMask_commandParameter);
-                  
-                 CommandParameter levelControl_stop_optionOverride_commandParameter = new CommandParameter("optionOverride", int.class);
-                 levelControl_stop_commandParams.put("optionOverride",levelControl_stop_optionOverride_commandParameter);
-                 
-           // Populate commands
-           CommandInfo levelControl_stop_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .stop((DefaultClusterCallback) callback
-                          ,  levelControl_stop_commandParams.get("optionMask") commandArguments.get("optionMask")
-                          ,  levelControl_stop_commandParams.get("optionOverride") commandArguments.get("optionOverride")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_stop_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("stop", levelControl_stop_CommandInfo);
-           Map<String, CommandParameter> levelControl_stopWithOnOff_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter levelControl_stopWithOnOff_commandParameter = new CommandParameter("LevelControl", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo levelControl_stopWithOnOff_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LevelControlCluster) cluster)
-                          .stopWithOnOff((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   levelControl_stopWithOnOff_commandParams
-           );
-           levelControl_ClusterCommandInfo.put("stopWithOnOff", levelControl_stopWithOnOff_CommandInfo);
-     // Populate cluster
-     ClusterInfo levelControl_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.LevelControlCluster(ptr, endpointId), levelControl_ClusterCommandInfo);
-     clusterMap.put("levelControl", levelControl_clusterInfo);
-     Map<String, CommandInfo> lowPower_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> lowPower_sleep_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter lowPower_sleep_commandParameter = new CommandParameter("LowPower", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo lowPower_sleep_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.LowPowerCluster) cluster)
-                          .sleep((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   lowPower_sleep_commandParams
-           );
-           lowPower_ClusterCommandInfo.put("sleep", lowPower_sleep_CommandInfo);
-     // Populate cluster
-     ClusterInfo lowPower_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.LowPowerCluster(ptr, endpointId), lowPower_ClusterCommandInfo);
-     clusterMap.put("lowPower", lowPower_clusterInfo);
-     Map<String, CommandInfo> mediaInput_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> mediaInput_hideInputStatus_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaInput_hideInputStatus_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo mediaInput_hideInputStatus_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaInputCluster) cluster)
-                          .hideInputStatus((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaInput_hideInputStatus_commandParams
-           );
-           mediaInput_ClusterCommandInfo.put("hideInputStatus", mediaInput_hideInputStatus_CommandInfo);
-           Map<String, CommandParameter> mediaInput_renameInput_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaInput_renameInput_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter mediaInput_renameInput_index_commandParameter = new CommandParameter("index", int.class);
-                 mediaInput_renameInput_commandParams.put("index",mediaInput_renameInput_index_commandParameter);
-                  
-                 CommandParameter mediaInput_renameInput_name_commandParameter = new CommandParameter("name", String.class);
-                 mediaInput_renameInput_commandParams.put("name",mediaInput_renameInput_name_commandParameter);
-                 
-           // Populate commands
-           CommandInfo mediaInput_renameInput_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaInputCluster) cluster)
-                          .renameInput((DefaultClusterCallback) callback
-                          ,  mediaInput_renameInput_commandParams.get("index") commandArguments.get("index")
-                          ,  mediaInput_renameInput_commandParams.get("name") commandArguments.get("name")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaInput_renameInput_commandParams
-           );
-           mediaInput_ClusterCommandInfo.put("renameInput", mediaInput_renameInput_CommandInfo);
-           Map<String, CommandParameter> mediaInput_selectInput_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaInput_selectInput_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter mediaInput_selectInput_index_commandParameter = new CommandParameter("index", int.class);
-                 mediaInput_selectInput_commandParams.put("index",mediaInput_selectInput_index_commandParameter);
-                 
-           // Populate commands
-           CommandInfo mediaInput_selectInput_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaInputCluster) cluster)
-                          .selectInput((DefaultClusterCallback) callback
-                          ,  mediaInput_selectInput_commandParams.get("index") commandArguments.get("index")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaInput_selectInput_commandParams
-           );
-           mediaInput_ClusterCommandInfo.put("selectInput", mediaInput_selectInput_CommandInfo);
-           Map<String, CommandParameter> mediaInput_showInputStatus_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaInput_showInputStatus_commandParameter = new CommandParameter("MediaInput", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo mediaInput_showInputStatus_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaInputCluster) cluster)
-                          .showInputStatus((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaInput_showInputStatus_commandParams
-           );
-           mediaInput_ClusterCommandInfo.put("showInputStatus", mediaInput_showInputStatus_CommandInfo);
-     // Populate cluster
-     ClusterInfo mediaInput_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.MediaInputCluster(ptr, endpointId), mediaInput_ClusterCommandInfo);
-     clusterMap.put("mediaInput", mediaInput_clusterInfo);
-     Map<String, CommandInfo> mediaPlayback_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> mediaPlayback_mediaFastForward_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaFastForward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaFastForward_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaFastForward((ChipClusters.MediaPlaybackCluster.MediaFastForwardResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaFastForward_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaFastForward", mediaPlayback_mediaFastForward_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaNext_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaNext_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaNext_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaNext((ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaNext_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaNext", mediaPlayback_mediaNext_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaPause_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaPause_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaPause_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaPause((ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaPause_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaPause", mediaPlayback_mediaPause_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaPlay_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaPlay_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaPlay_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaPlay((ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaPlay_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaPlay", mediaPlayback_mediaPlay_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaPrevious_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaPrevious_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaPrevious_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaPrevious((ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaPrevious_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaPrevious", mediaPlayback_mediaPrevious_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaRewind_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaRewind_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaRewind_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaRewind((ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaRewind_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaRewind", mediaPlayback_mediaRewind_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaSeek_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaSeek_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
-                 CommandParameter mediaPlayback_mediaSeek_position_commandParameter = new CommandParameter("position", long.class);
-                 mediaPlayback_mediaSeek_commandParams.put("position",mediaPlayback_mediaSeek_position_commandParameter);
-                 
-           // Populate commands
-           CommandInfo mediaPlayback_mediaSeek_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaSeek((ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback) callback
-                           ,  mediaPlayback_mediaSeek_commandParams.get("position") commandArguments.get("position")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaSeek_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaSeek", mediaPlayback_mediaSeek_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaSkipBackward_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaSkipBackward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback.class);
-                 CommandParameter mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter = new CommandParameter("deltaPositionMilliseconds", long.class);
-                 mediaPlayback_mediaSkipBackward_commandParams.put("deltaPositionMilliseconds",mediaPlayback_mediaSkipBackward_deltaPositionMilliseconds_commandParameter);
-                 
-           // Populate commands
-           CommandInfo mediaPlayback_mediaSkipBackward_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaSkipBackward((ChipClusters.MediaPlaybackCluster.MediaSkipBackwardResponseCallback) callback
-                           ,  mediaPlayback_mediaSkipBackward_commandParams.get("deltaPositionMilliseconds") commandArguments.get("deltaPositionMilliseconds")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaSkipBackward_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaSkipBackward", mediaPlayback_mediaSkipBackward_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaSkipForward_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaSkipForward_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback.class);
-                 CommandParameter mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter = new CommandParameter("deltaPositionMilliseconds", long.class);
-                 mediaPlayback_mediaSkipForward_commandParams.put("deltaPositionMilliseconds",mediaPlayback_mediaSkipForward_deltaPositionMilliseconds_commandParameter);
-                 
-           // Populate commands
-           CommandInfo mediaPlayback_mediaSkipForward_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaSkipForward((ChipClusters.MediaPlaybackCluster.MediaSkipForwardResponseCallback) callback
-                           ,  mediaPlayback_mediaSkipForward_commandParams.get("deltaPositionMilliseconds") commandArguments.get("deltaPositionMilliseconds")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaSkipForward_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaSkipForward", mediaPlayback_mediaSkipForward_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaStartOver_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaStartOver_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaStartOver_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaStartOver((ChipClusters.MediaPlaybackCluster.MediaStartOverResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaStartOver_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaStartOver", mediaPlayback_mediaStartOver_CommandInfo);
-           Map<String, CommandParameter> mediaPlayback_mediaStop_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter mediaPlayback_mediaStop_commandParameter = new CommandParameter("MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
-           // Populate commands
-           CommandInfo mediaPlayback_mediaStop_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.MediaPlaybackCluster) cluster)
-                           .mediaStop((ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   mediaPlayback_mediaStop_commandParams
-           );
-           mediaPlayback_ClusterCommandInfo.put("mediaStop", mediaPlayback_mediaStop_CommandInfo);
-     // Populate cluster
-     ClusterInfo mediaPlayback_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.MediaPlaybackCluster(ptr, endpointId), mediaPlayback_ClusterCommandInfo);
-     clusterMap.put("mediaPlayback", mediaPlayback_clusterInfo);
-     Map<String, CommandInfo> networkCommissioning_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> networkCommissioning_addThreadNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_addThreadNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_addThreadNetwork_operationalDataset_commandParameter = new CommandParameter("operationalDataset", byte[].class);
-                 networkCommissioning_addThreadNetwork_commandParams.put("operationalDataset",networkCommissioning_addThreadNetwork_operationalDataset_commandParameter);
-                  
-                 CommandParameter networkCommissioning_addThreadNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_addThreadNetwork_commandParams.put("breadcrumb",networkCommissioning_addThreadNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_addThreadNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_addThreadNetwork_commandParams.put("timeoutMs",networkCommissioning_addThreadNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_addThreadNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .addThreadNetwork((ChipClusters.NetworkCommissioningCluster.AddThreadNetworkResponseCallback) callback
-                           ,  networkCommissioning_addThreadNetwork_commandParams.get("operationalDataset") commandArguments.get("operationalDataset")
-                           ,  networkCommissioning_addThreadNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_addThreadNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_addThreadNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("addThreadNetwork", networkCommissioning_addThreadNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_addWiFiNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_addWiFiNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_addWiFiNetwork_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-                 networkCommissioning_addWiFiNetwork_commandParams.put("ssid",networkCommissioning_addWiFiNetwork_ssid_commandParameter);
-                  
-                 CommandParameter networkCommissioning_addWiFiNetwork_credentials_commandParameter = new CommandParameter("credentials", byte[].class);
-                 networkCommissioning_addWiFiNetwork_commandParams.put("credentials",networkCommissioning_addWiFiNetwork_credentials_commandParameter);
-                  
-                 CommandParameter networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_addWiFiNetwork_commandParams.put("breadcrumb",networkCommissioning_addWiFiNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_addWiFiNetwork_commandParams.put("timeoutMs",networkCommissioning_addWiFiNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_addWiFiNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .addWiFiNetwork((ChipClusters.NetworkCommissioningCluster.AddWiFiNetworkResponseCallback) callback
-                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("ssid") commandArguments.get("ssid")
-                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("credentials") commandArguments.get("credentials")
-                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_addWiFiNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_addWiFiNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("addWiFiNetwork", networkCommissioning_addWiFiNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_disableNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_disableNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_disableNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-                 networkCommissioning_disableNetwork_commandParams.put("networkID",networkCommissioning_disableNetwork_networkID_commandParameter);
-                  
-                 CommandParameter networkCommissioning_disableNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_disableNetwork_commandParams.put("breadcrumb",networkCommissioning_disableNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_disableNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_disableNetwork_commandParams.put("timeoutMs",networkCommissioning_disableNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_disableNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .disableNetwork((ChipClusters.NetworkCommissioningCluster.DisableNetworkResponseCallback) callback
-                           ,  networkCommissioning_disableNetwork_commandParams.get("networkID") commandArguments.get("networkID")
-                           ,  networkCommissioning_disableNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_disableNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_disableNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("disableNetwork", networkCommissioning_disableNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_enableNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_enableNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_enableNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-                 networkCommissioning_enableNetwork_commandParams.put("networkID",networkCommissioning_enableNetwork_networkID_commandParameter);
-                  
-                 CommandParameter networkCommissioning_enableNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_enableNetwork_commandParams.put("breadcrumb",networkCommissioning_enableNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_enableNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_enableNetwork_commandParams.put("timeoutMs",networkCommissioning_enableNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_enableNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .enableNetwork((ChipClusters.NetworkCommissioningCluster.EnableNetworkResponseCallback) callback
-                           ,  networkCommissioning_enableNetwork_commandParams.get("networkID") commandArguments.get("networkID")
-                           ,  networkCommissioning_enableNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_enableNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_enableNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("enableNetwork", networkCommissioning_enableNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_getLastNetworkCommissioningResult_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_getLastNetworkCommissioningResult_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_getLastNetworkCommissioningResult_commandParams.put("timeoutMs",networkCommissioning_getLastNetworkCommissioningResult_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_getLastNetworkCommissioningResult_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                          .getLastNetworkCommissioningResult((DefaultClusterCallback) callback
-                          ,  networkCommissioning_getLastNetworkCommissioningResult_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_getLastNetworkCommissioningResult_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("getLastNetworkCommissioningResult", networkCommissioning_getLastNetworkCommissioningResult_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_removeNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_removeNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_removeNetwork_networkID_commandParameter = new CommandParameter("networkID", byte[].class);
-                 networkCommissioning_removeNetwork_commandParams.put("networkID",networkCommissioning_removeNetwork_networkID_commandParameter);
-                  
-                 CommandParameter networkCommissioning_removeNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_removeNetwork_commandParams.put("breadcrumb",networkCommissioning_removeNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_removeNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_removeNetwork_commandParams.put("timeoutMs",networkCommissioning_removeNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_removeNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .removeNetwork((ChipClusters.NetworkCommissioningCluster.RemoveNetworkResponseCallback) callback
-                           ,  networkCommissioning_removeNetwork_commandParams.get("networkID") commandArguments.get("networkID")
-                           ,  networkCommissioning_removeNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_removeNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_removeNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("removeNetwork", networkCommissioning_removeNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_scanNetworks_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_scanNetworks_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback.class);
-                 CommandParameter networkCommissioning_scanNetworks_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-                 networkCommissioning_scanNetworks_commandParams.put("ssid",networkCommissioning_scanNetworks_ssid_commandParameter);
-                  
-                 CommandParameter networkCommissioning_scanNetworks_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_scanNetworks_commandParams.put("breadcrumb",networkCommissioning_scanNetworks_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_scanNetworks_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_scanNetworks_commandParams.put("timeoutMs",networkCommissioning_scanNetworks_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_scanNetworks_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .scanNetworks((ChipClusters.NetworkCommissioningCluster.ScanNetworksResponseCallback) callback
-                           ,  networkCommissioning_scanNetworks_commandParams.get("ssid") commandArguments.get("ssid")
-                           ,  networkCommissioning_scanNetworks_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_scanNetworks_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_scanNetworks_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("scanNetworks", networkCommissioning_scanNetworks_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_updateThreadNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_updateThreadNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter = new CommandParameter("operationalDataset", byte[].class);
-                 networkCommissioning_updateThreadNetwork_commandParams.put("operationalDataset",networkCommissioning_updateThreadNetwork_operationalDataset_commandParameter);
-                  
-                 CommandParameter networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_updateThreadNetwork_commandParams.put("breadcrumb",networkCommissioning_updateThreadNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_updateThreadNetwork_commandParams.put("timeoutMs",networkCommissioning_updateThreadNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_updateThreadNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .updateThreadNetwork((ChipClusters.NetworkCommissioningCluster.UpdateThreadNetworkResponseCallback) callback
-                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("operationalDataset") commandArguments.get("operationalDataset")
-                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_updateThreadNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_updateThreadNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("updateThreadNetwork", networkCommissioning_updateThreadNetwork_CommandInfo);
-           Map<String, CommandParameter> networkCommissioning_updateWiFiNetwork_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter networkCommissioning_updateWiFiNetwork_commandParameter = new CommandParameter("NetworkCommissioning", ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback.class);
-                 CommandParameter networkCommissioning_updateWiFiNetwork_ssid_commandParameter = new CommandParameter("ssid", byte[].class);
-                 networkCommissioning_updateWiFiNetwork_commandParams.put("ssid",networkCommissioning_updateWiFiNetwork_ssid_commandParameter);
-                  
-                 CommandParameter networkCommissioning_updateWiFiNetwork_credentials_commandParameter = new CommandParameter("credentials", byte[].class);
-                 networkCommissioning_updateWiFiNetwork_commandParams.put("credentials",networkCommissioning_updateWiFiNetwork_credentials_commandParameter);
-                  
-                 CommandParameter networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter = new CommandParameter("breadcrumb", long.class);
-                 networkCommissioning_updateWiFiNetwork_commandParams.put("breadcrumb",networkCommissioning_updateWiFiNetwork_breadcrumb_commandParameter);
-                  
-                 CommandParameter networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter = new CommandParameter("timeoutMs", long.class);
-                 networkCommissioning_updateWiFiNetwork_commandParams.put("timeoutMs",networkCommissioning_updateWiFiNetwork_timeoutMs_commandParameter);
-                 
-           // Populate commands
-           CommandInfo networkCommissioning_updateWiFiNetwork_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.NetworkCommissioningCluster) cluster)
-                           .updateWiFiNetwork((ChipClusters.NetworkCommissioningCluster.UpdateWiFiNetworkResponseCallback) callback
-                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("ssid") commandArguments.get("ssid")
-                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("credentials") commandArguments.get("credentials")
-                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("breadcrumb") commandArguments.get("breadcrumb")
-                           ,  networkCommissioning_updateWiFiNetwork_commandParams.get("timeoutMs") commandArguments.get("timeoutMs")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   networkCommissioning_updateWiFiNetwork_commandParams
-           );
-           networkCommissioning_ClusterCommandInfo.put("updateWiFiNetwork", networkCommissioning_updateWiFiNetwork_CommandInfo);
-     // Populate cluster
-     ClusterInfo networkCommissioning_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.NetworkCommissioningCluster(ptr, endpointId), networkCommissioning_ClusterCommandInfo);
-     clusterMap.put("networkCommissioning", networkCommissioning_clusterInfo);
-     Map<String, CommandInfo> otaSoftwareUpdateProvider_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> otaSoftwareUpdateProvider_applyUpdateRequest_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback.class);
-                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter = new CommandParameter("updateToken", byte[].class);
-                 otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put("updateToken",otaSoftwareUpdateProvider_applyUpdateRequest_updateToken_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter = new CommandParameter("newVersion", long.class);
-                 otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.put("newVersion",otaSoftwareUpdateProvider_applyUpdateRequest_newVersion_commandParameter);
-                 
-           // Populate commands
-           CommandInfo otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                           .applyUpdateRequest((ChipClusters.OtaSoftwareUpdateProviderCluster.ApplyUpdateRequestResponseCallback) callback
-                           ,  otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.get("updateToken") commandArguments.get("updateToken")
-                           ,  otaSoftwareUpdateProvider_applyUpdateRequest_commandParams.get("newVersion") commandArguments.get("newVersion")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   otaSoftwareUpdateProvider_applyUpdateRequest_commandParams
-           );
-           otaSoftwareUpdateProvider_ClusterCommandInfo.put("applyUpdateRequest", otaSoftwareUpdateProvider_applyUpdateRequest_CommandInfo);
-           Map<String, CommandParameter> otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter = new CommandParameter("updateToken", byte[].class);
-                 otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put("updateToken",otaSoftwareUpdateProvider_notifyUpdateApplied_updateToken_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter = new CommandParameter("softwareVersion", long.class);
-                 otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.put("softwareVersion",otaSoftwareUpdateProvider_notifyUpdateApplied_softwareVersion_commandParameter);
-                 
-           // Populate commands
-           CommandInfo otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                          .notifyUpdateApplied((DefaultClusterCallback) callback
-                          ,  otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.get("updateToken") commandArguments.get("updateToken")
-                          ,  otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams.get("softwareVersion") commandArguments.get("softwareVersion")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   otaSoftwareUpdateProvider_notifyUpdateApplied_commandParams
-           );
-           otaSoftwareUpdateProvider_ClusterCommandInfo.put("notifyUpdateApplied", otaSoftwareUpdateProvider_notifyUpdateApplied_CommandInfo);
-           Map<String, CommandParameter> otaSoftwareUpdateProvider_queryImage_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_commandParameter = new CommandParameter("OtaSoftwareUpdateProvider", ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback.class);
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter = new CommandParameter("vendorId", int.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("vendorId",otaSoftwareUpdateProvider_queryImage_vendorId_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_productId_commandParameter = new CommandParameter("productId", int.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("productId",otaSoftwareUpdateProvider_queryImage_productId_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter = new CommandParameter("hardwareVersion", int.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("hardwareVersion",otaSoftwareUpdateProvider_queryImage_hardwareVersion_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter = new CommandParameter("softwareVersion", long.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("softwareVersion",otaSoftwareUpdateProvider_queryImage_softwareVersion_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter = new CommandParameter("protocolsSupported", int.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("protocolsSupported",otaSoftwareUpdateProvider_queryImage_protocolsSupported_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_location_commandParameter = new CommandParameter("location", String.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("location",otaSoftwareUpdateProvider_queryImage_location_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter = new CommandParameter("requestorCanConsent", boolean.class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("requestorCanConsent",otaSoftwareUpdateProvider_queryImage_requestorCanConsent_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter = new CommandParameter("metadataForProvider", byte[].class);
-                 otaSoftwareUpdateProvider_queryImage_commandParams.put("metadataForProvider",otaSoftwareUpdateProvider_queryImage_metadataForProvider_commandParameter);
-                 
-           // Populate commands
-           CommandInfo otaSoftwareUpdateProvider_queryImage_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OtaSoftwareUpdateProviderCluster) cluster)
-                           .queryImage((ChipClusters.OtaSoftwareUpdateProviderCluster.QueryImageResponseCallback) callback
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("vendorId") commandArguments.get("vendorId")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("productId") commandArguments.get("productId")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("hardwareVersion") commandArguments.get("hardwareVersion")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("softwareVersion") commandArguments.get("softwareVersion")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("protocolsSupported") commandArguments.get("protocolsSupported")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("location") commandArguments.get("location")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("requestorCanConsent") commandArguments.get("requestorCanConsent")
-                           ,  otaSoftwareUpdateProvider_queryImage_commandParams.get("metadataForProvider") commandArguments.get("metadataForProvider")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   otaSoftwareUpdateProvider_queryImage_commandParams
-           );
-           otaSoftwareUpdateProvider_ClusterCommandInfo.put("queryImage", otaSoftwareUpdateProvider_queryImage_CommandInfo);
-     // Populate cluster
-     ClusterInfo otaSoftwareUpdateProvider_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateProviderCluster(ptr, endpointId), otaSoftwareUpdateProvider_ClusterCommandInfo);
-     clusterMap.put("otaSoftwareUpdateProvider", otaSoftwareUpdateProvider_clusterInfo);
-     Map<String, CommandInfo> otaSoftwareUpdateRequestor_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> otaSoftwareUpdateRequestor_announceOtaProvider_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_commandParameter = new CommandParameter("OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter = new CommandParameter("providerLocation", byte[].class);
-                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("providerLocation",otaSoftwareUpdateRequestor_announceOtaProvider_providerLocation_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter = new CommandParameter("vendorId", int.class);
-                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("vendorId",otaSoftwareUpdateRequestor_announceOtaProvider_vendorId_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter = new CommandParameter("announcementReason", int.class);
-                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("announcementReason",otaSoftwareUpdateRequestor_announceOtaProvider_announcementReason_commandParameter);
-                  
-                 CommandParameter otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter = new CommandParameter("metadataForNode", byte[].class);
-                 otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.put("metadataForNode",otaSoftwareUpdateRequestor_announceOtaProvider_metadataForNode_commandParameter);
-                 
-           // Populate commands
-           CommandInfo otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OtaSoftwareUpdateRequestorCluster) cluster)
-                          .announceOtaProvider((DefaultClusterCallback) callback
-                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("providerLocation") commandArguments.get("providerLocation")
-                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("vendorId") commandArguments.get("vendorId")
-                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("announcementReason") commandArguments.get("announcementReason")
-                          ,  otaSoftwareUpdateRequestor_announceOtaProvider_commandParams.get("metadataForNode") commandArguments.get("metadataForNode")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   otaSoftwareUpdateRequestor_announceOtaProvider_commandParams
-           );
-           otaSoftwareUpdateRequestor_ClusterCommandInfo.put("announceOtaProvider", otaSoftwareUpdateRequestor_announceOtaProvider_CommandInfo);
-     // Populate cluster
-     ClusterInfo otaSoftwareUpdateRequestor_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OtaSoftwareUpdateRequestorCluster(ptr, endpointId), otaSoftwareUpdateRequestor_ClusterCommandInfo);
-     clusterMap.put("otaSoftwareUpdateRequestor", otaSoftwareUpdateRequestor_clusterInfo);
-     Map<String, CommandInfo> occupancySensing_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo occupancySensing_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OccupancySensingCluster(ptr, endpointId), occupancySensing_ClusterCommandInfo);
-     clusterMap.put("occupancySensing", occupancySensing_clusterInfo);
-     Map<String, CommandInfo> onOff_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> onOff_off_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_off_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo onOff_off_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .off((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_off_commandParams
-           );
-           onOff_ClusterCommandInfo.put("off", onOff_off_CommandInfo);
-           Map<String, CommandParameter> onOff_offWithEffect_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_offWithEffect_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter onOff_offWithEffect_effectId_commandParameter = new CommandParameter("effectId", int.class);
-                 onOff_offWithEffect_commandParams.put("effectId",onOff_offWithEffect_effectId_commandParameter);
-                  
-                 CommandParameter onOff_offWithEffect_effectVariant_commandParameter = new CommandParameter("effectVariant", int.class);
-                 onOff_offWithEffect_commandParams.put("effectVariant",onOff_offWithEffect_effectVariant_commandParameter);
-                 
-           // Populate commands
-           CommandInfo onOff_offWithEffect_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .offWithEffect((DefaultClusterCallback) callback
-                          ,  onOff_offWithEffect_commandParams.get("effectId") commandArguments.get("effectId")
-                          ,  onOff_offWithEffect_commandParams.get("effectVariant") commandArguments.get("effectVariant")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_offWithEffect_commandParams
-           );
-           onOff_ClusterCommandInfo.put("offWithEffect", onOff_offWithEffect_CommandInfo);
-           Map<String, CommandParameter> onOff_on_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_on_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo onOff_on_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .on((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_on_commandParams
-           );
-           onOff_ClusterCommandInfo.put("on", onOff_on_CommandInfo);
-           Map<String, CommandParameter> onOff_onWithRecallGlobalScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_onWithRecallGlobalScene_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo onOff_onWithRecallGlobalScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .onWithRecallGlobalScene((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_onWithRecallGlobalScene_commandParams
-           );
-           onOff_ClusterCommandInfo.put("onWithRecallGlobalScene", onOff_onWithRecallGlobalScene_CommandInfo);
-           Map<String, CommandParameter> onOff_onWithTimedOff_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_onWithTimedOff_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter onOff_onWithTimedOff_onOffControl_commandParameter = new CommandParameter("onOffControl", int.class);
-                 onOff_onWithTimedOff_commandParams.put("onOffControl",onOff_onWithTimedOff_onOffControl_commandParameter);
-                  
-                 CommandParameter onOff_onWithTimedOff_onTime_commandParameter = new CommandParameter("onTime", int.class);
-                 onOff_onWithTimedOff_commandParams.put("onTime",onOff_onWithTimedOff_onTime_commandParameter);
-                  
-                 CommandParameter onOff_onWithTimedOff_offWaitTime_commandParameter = new CommandParameter("offWaitTime", int.class);
-                 onOff_onWithTimedOff_commandParams.put("offWaitTime",onOff_onWithTimedOff_offWaitTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo onOff_onWithTimedOff_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .onWithTimedOff((DefaultClusterCallback) callback
-                          ,  onOff_onWithTimedOff_commandParams.get("onOffControl") commandArguments.get("onOffControl")
-                          ,  onOff_onWithTimedOff_commandParams.get("onTime") commandArguments.get("onTime")
-                          ,  onOff_onWithTimedOff_commandParams.get("offWaitTime") commandArguments.get("offWaitTime")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_onWithTimedOff_commandParams
-           );
-           onOff_ClusterCommandInfo.put("onWithTimedOff", onOff_onWithTimedOff_CommandInfo);
-           Map<String, CommandParameter> onOff_toggle_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter onOff_toggle_commandParameter = new CommandParameter("OnOff", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo onOff_toggle_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OnOffCluster) cluster)
-                          .toggle((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   onOff_toggle_commandParams
-           );
-           onOff_ClusterCommandInfo.put("toggle", onOff_toggle_CommandInfo);
-     // Populate cluster
-     ClusterInfo onOff_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OnOffCluster(ptr, endpointId), onOff_ClusterCommandInfo);
-     clusterMap.put("onOff", onOff_clusterInfo);
-     Map<String, CommandInfo> onOffSwitchConfiguration_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo onOffSwitchConfiguration_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OnOffSwitchConfigurationCluster(ptr, endpointId), onOffSwitchConfiguration_ClusterCommandInfo);
-     clusterMap.put("onOffSwitchConfiguration", onOffSwitchConfiguration_clusterInfo);
-     Map<String, CommandInfo> operationalCredentials_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> operationalCredentials_addNOC_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_addNOC_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-                 CommandParameter operationalCredentials_addNOC_NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
-                 operationalCredentials_addNOC_commandParams.put("NOCValue",operationalCredentials_addNOC_NOCValue_commandParameter);
-                  
-                 CommandParameter operationalCredentials_addNOC_ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
-                 operationalCredentials_addNOC_commandParams.put("ICACValue",operationalCredentials_addNOC_ICACValue_commandParameter);
-                  
-                 CommandParameter operationalCredentials_addNOC_IPKValue_commandParameter = new CommandParameter("IPKValue", byte[].class);
-                 operationalCredentials_addNOC_commandParams.put("IPKValue",operationalCredentials_addNOC_IPKValue_commandParameter);
-                  
-                 CommandParameter operationalCredentials_addNOC_caseAdminNode_commandParameter = new CommandParameter("caseAdminNode", long.class);
-                 operationalCredentials_addNOC_commandParams.put("caseAdminNode",operationalCredentials_addNOC_caseAdminNode_commandParameter);
-                  
-                 CommandParameter operationalCredentials_addNOC_adminVendorId_commandParameter = new CommandParameter("adminVendorId", int.class);
-                 operationalCredentials_addNOC_commandParams.put("adminVendorId",operationalCredentials_addNOC_adminVendorId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_addNOC_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .addNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-                           ,  operationalCredentials_addNOC_commandParams.get("NOCValue") commandArguments.get("NOCValue")
-                           ,  operationalCredentials_addNOC_commandParams.get("ICACValue") commandArguments.get("ICACValue")
-                           ,  operationalCredentials_addNOC_commandParams.get("IPKValue") commandArguments.get("IPKValue")
-                           ,  operationalCredentials_addNOC_commandParams.get("caseAdminNode") commandArguments.get("caseAdminNode")
-                           ,  operationalCredentials_addNOC_commandParams.get("adminVendorId") commandArguments.get("adminVendorId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_addNOC_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("addNOC", operationalCredentials_addNOC_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_addTrustedRootCertificate_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_addTrustedRootCertificate_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter = new CommandParameter("rootCertificate", byte[].class);
-                 operationalCredentials_addTrustedRootCertificate_commandParams.put("rootCertificate",operationalCredentials_addTrustedRootCertificate_rootCertificate_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_addTrustedRootCertificate_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                          .addTrustedRootCertificate((DefaultClusterCallback) callback
-                          ,  operationalCredentials_addTrustedRootCertificate_commandParams.get("rootCertificate") commandArguments.get("rootCertificate")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_addTrustedRootCertificate_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("addTrustedRootCertificate", operationalCredentials_addTrustedRootCertificate_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_attestationRequest_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_attestationRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback.class);
-                 CommandParameter operationalCredentials_attestationRequest_attestationNonce_commandParameter = new CommandParameter("attestationNonce", byte[].class);
-                 operationalCredentials_attestationRequest_commandParams.put("attestationNonce",operationalCredentials_attestationRequest_attestationNonce_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_attestationRequest_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .attestationRequest((ChipClusters.OperationalCredentialsCluster.AttestationResponseCallback) callback
-                           ,  operationalCredentials_attestationRequest_commandParams.get("attestationNonce") commandArguments.get("attestationNonce")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_attestationRequest_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("attestationRequest", operationalCredentials_attestationRequest_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_certificateChainRequest_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_certificateChainRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback.class);
-                 CommandParameter operationalCredentials_certificateChainRequest_certificateType_commandParameter = new CommandParameter("certificateType", int.class);
-                 operationalCredentials_certificateChainRequest_commandParams.put("certificateType",operationalCredentials_certificateChainRequest_certificateType_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_certificateChainRequest_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .certificateChainRequest((ChipClusters.OperationalCredentialsCluster.CertificateChainResponseCallback) callback
-                           ,  operationalCredentials_certificateChainRequest_commandParams.get("certificateType") commandArguments.get("certificateType")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_certificateChainRequest_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("certificateChainRequest", operationalCredentials_certificateChainRequest_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_opCSRRequest_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_opCSRRequest_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback.class);
-                 CommandParameter operationalCredentials_opCSRRequest_CSRNonce_commandParameter = new CommandParameter("CSRNonce", byte[].class);
-                 operationalCredentials_opCSRRequest_commandParams.put("CSRNonce",operationalCredentials_opCSRRequest_CSRNonce_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_opCSRRequest_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .opCSRRequest((ChipClusters.OperationalCredentialsCluster.OpCSRResponseCallback) callback
-                           ,  operationalCredentials_opCSRRequest_commandParams.get("CSRNonce") commandArguments.get("CSRNonce")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_opCSRRequest_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("opCSRRequest", operationalCredentials_opCSRRequest_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_removeFabric_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_removeFabric_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-                 CommandParameter operationalCredentials_removeFabric_fabricIndex_commandParameter = new CommandParameter("fabricIndex", int.class);
-                 operationalCredentials_removeFabric_commandParams.put("fabricIndex",operationalCredentials_removeFabric_fabricIndex_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_removeFabric_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .removeFabric((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-                           ,  operationalCredentials_removeFabric_commandParams.get("fabricIndex") commandArguments.get("fabricIndex")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_removeFabric_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("removeFabric", operationalCredentials_removeFabric_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_removeTrustedRootCertificate_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_removeTrustedRootCertificate_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter = new CommandParameter("trustedRootIdentifier", byte[].class);
-                 operationalCredentials_removeTrustedRootCertificate_commandParams.put("trustedRootIdentifier",operationalCredentials_removeTrustedRootCertificate_trustedRootIdentifier_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_removeTrustedRootCertificate_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                          .removeTrustedRootCertificate((DefaultClusterCallback) callback
-                          ,  operationalCredentials_removeTrustedRootCertificate_commandParams.get("trustedRootIdentifier") commandArguments.get("trustedRootIdentifier")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_removeTrustedRootCertificate_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("removeTrustedRootCertificate", operationalCredentials_removeTrustedRootCertificate_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_updateFabricLabel_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_updateFabricLabel_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-                 CommandParameter operationalCredentials_updateFabricLabel_label_commandParameter = new CommandParameter("label", String.class);
-                 operationalCredentials_updateFabricLabel_commandParams.put("label",operationalCredentials_updateFabricLabel_label_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_updateFabricLabel_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .updateFabricLabel((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-                           ,  operationalCredentials_updateFabricLabel_commandParams.get("label") commandArguments.get("label")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_updateFabricLabel_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("updateFabricLabel", operationalCredentials_updateFabricLabel_CommandInfo);
-           Map<String, CommandParameter> operationalCredentials_updateNOC_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter operationalCredentials_updateNOC_commandParameter = new CommandParameter("OperationalCredentials", ChipClusters.OperationalCredentialsCluster.NOCResponseCallback.class);
-                 CommandParameter operationalCredentials_updateNOC_NOCValue_commandParameter = new CommandParameter("NOCValue", byte[].class);
-                 operationalCredentials_updateNOC_commandParams.put("NOCValue",operationalCredentials_updateNOC_NOCValue_commandParameter);
-                  
-                 CommandParameter operationalCredentials_updateNOC_ICACValue_commandParameter = new CommandParameter("ICACValue", byte[].class);
-                 operationalCredentials_updateNOC_commandParams.put("ICACValue",operationalCredentials_updateNOC_ICACValue_commandParameter);
-                 
-           // Populate commands
-           CommandInfo operationalCredentials_updateNOC_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.OperationalCredentialsCluster) cluster)
-                           .updateNOC((ChipClusters.OperationalCredentialsCluster.NOCResponseCallback) callback
-                           ,  operationalCredentials_updateNOC_commandParams.get("NOCValue") commandArguments.get("NOCValue")
-                           ,  operationalCredentials_updateNOC_commandParams.get("ICACValue") commandArguments.get("ICACValue")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   operationalCredentials_updateNOC_commandParams
-           );
-           operationalCredentials_ClusterCommandInfo.put("updateNOC", operationalCredentials_updateNOC_CommandInfo);
-     // Populate cluster
-     ClusterInfo operationalCredentials_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.OperationalCredentialsCluster(ptr, endpointId), operationalCredentials_ClusterCommandInfo);
-     clusterMap.put("operationalCredentials", operationalCredentials_clusterInfo);
-     Map<String, CommandInfo> powerSource_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo powerSource_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.PowerSourceCluster(ptr, endpointId), powerSource_ClusterCommandInfo);
-     clusterMap.put("powerSource", powerSource_clusterInfo);
-     Map<String, CommandInfo> pressureMeasurement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo pressureMeasurement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.PressureMeasurementCluster(ptr, endpointId), pressureMeasurement_ClusterCommandInfo);
-     clusterMap.put("pressureMeasurement", pressureMeasurement_clusterInfo);
-     Map<String, CommandInfo> pumpConfigurationAndControl_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo pumpConfigurationAndControl_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.PumpConfigurationAndControlCluster(ptr, endpointId), pumpConfigurationAndControl_ClusterCommandInfo);
-     clusterMap.put("pumpConfigurationAndControl", pumpConfigurationAndControl_clusterInfo);
-     Map<String, CommandInfo> relativeHumidityMeasurement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo relativeHumidityMeasurement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.RelativeHumidityMeasurementCluster(ptr, endpointId), relativeHumidityMeasurement_ClusterCommandInfo);
-     clusterMap.put("relativeHumidityMeasurement", relativeHumidityMeasurement_clusterInfo);
-     Map<String, CommandInfo> scenes_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> scenes_addScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_addScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
-                 CommandParameter scenes_addScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_addScene_commandParams.put("groupId",scenes_addScene_groupId_commandParameter);
-                  
-                 CommandParameter scenes_addScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-                 scenes_addScene_commandParams.put("sceneId",scenes_addScene_sceneId_commandParameter);
-                  
-                 CommandParameter scenes_addScene_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 scenes_addScene_commandParams.put("transitionTime",scenes_addScene_transitionTime_commandParameter);
-                  
-                 CommandParameter scenes_addScene_sceneName_commandParameter = new CommandParameter("sceneName", String.class);
-                 scenes_addScene_commandParams.put("sceneName",scenes_addScene_sceneName_commandParameter);
-                  
-                 CommandParameter scenes_addScene_clusterId_commandParameter = new CommandParameter("clusterId", long.class);
-                 scenes_addScene_commandParams.put("clusterId",scenes_addScene_clusterId_commandParameter);
-                  
-                 CommandParameter scenes_addScene_length_commandParameter = new CommandParameter("length", int.class);
-                 scenes_addScene_commandParams.put("length",scenes_addScene_length_commandParameter);
-                  
-                 CommandParameter scenes_addScene_value_commandParameter = new CommandParameter("value", int.class);
-                 scenes_addScene_commandParams.put("value",scenes_addScene_value_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_addScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .addScene((ChipClusters.ScenesCluster.AddSceneResponseCallback) callback
-                           ,  scenes_addScene_commandParams.get("groupId") commandArguments.get("groupId")
-                           ,  scenes_addScene_commandParams.get("sceneId") commandArguments.get("sceneId")
-                           ,  scenes_addScene_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                           ,  scenes_addScene_commandParams.get("sceneName") commandArguments.get("sceneName")
-                           ,  scenes_addScene_commandParams.get("clusterId") commandArguments.get("clusterId")
-                           ,  scenes_addScene_commandParams.get("length") commandArguments.get("length")
-                           ,  scenes_addScene_commandParams.get("value") commandArguments.get("value")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_addScene_commandParams
-           );
-           scenes_ClusterCommandInfo.put("addScene", scenes_addScene_CommandInfo);
-           Map<String, CommandParameter> scenes_getSceneMembership_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_getSceneMembership_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
-                 CommandParameter scenes_getSceneMembership_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_getSceneMembership_commandParams.put("groupId",scenes_getSceneMembership_groupId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_getSceneMembership_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .getSceneMembership((ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback
-                           ,  scenes_getSceneMembership_commandParams.get("groupId") commandArguments.get("groupId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_getSceneMembership_commandParams
-           );
-           scenes_ClusterCommandInfo.put("getSceneMembership", scenes_getSceneMembership_CommandInfo);
-           Map<String, CommandParameter> scenes_recallScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_recallScene_commandParameter = new CommandParameter("Scenes", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter scenes_recallScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_recallScene_commandParams.put("groupId",scenes_recallScene_groupId_commandParameter);
-                  
-                 CommandParameter scenes_recallScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-                 scenes_recallScene_commandParams.put("sceneId",scenes_recallScene_sceneId_commandParameter);
-                  
-                 CommandParameter scenes_recallScene_transitionTime_commandParameter = new CommandParameter("transitionTime", int.class);
-                 scenes_recallScene_commandParams.put("transitionTime",scenes_recallScene_transitionTime_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_recallScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                          .recallScene((DefaultClusterCallback) callback
-                          ,  scenes_recallScene_commandParams.get("groupId") commandArguments.get("groupId")
-                          ,  scenes_recallScene_commandParams.get("sceneId") commandArguments.get("sceneId")
-                          ,  scenes_recallScene_commandParams.get("transitionTime") commandArguments.get("transitionTime")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_recallScene_commandParams
-           );
-           scenes_ClusterCommandInfo.put("recallScene", scenes_recallScene_CommandInfo);
-           Map<String, CommandParameter> scenes_removeAllScenes_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_removeAllScenes_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
-                 CommandParameter scenes_removeAllScenes_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_removeAllScenes_commandParams.put("groupId",scenes_removeAllScenes_groupId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_removeAllScenes_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .removeAllScenes((ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback
-                           ,  scenes_removeAllScenes_commandParams.get("groupId") commandArguments.get("groupId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_removeAllScenes_commandParams
-           );
-           scenes_ClusterCommandInfo.put("removeAllScenes", scenes_removeAllScenes_CommandInfo);
-           Map<String, CommandParameter> scenes_removeScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_removeScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
-                 CommandParameter scenes_removeScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_removeScene_commandParams.put("groupId",scenes_removeScene_groupId_commandParameter);
-                  
-                 CommandParameter scenes_removeScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-                 scenes_removeScene_commandParams.put("sceneId",scenes_removeScene_sceneId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_removeScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .removeScene((ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback
-                           ,  scenes_removeScene_commandParams.get("groupId") commandArguments.get("groupId")
-                           ,  scenes_removeScene_commandParams.get("sceneId") commandArguments.get("sceneId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_removeScene_commandParams
-           );
-           scenes_ClusterCommandInfo.put("removeScene", scenes_removeScene_CommandInfo);
-           Map<String, CommandParameter> scenes_storeScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_storeScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
-                 CommandParameter scenes_storeScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_storeScene_commandParams.put("groupId",scenes_storeScene_groupId_commandParameter);
-                  
-                 CommandParameter scenes_storeScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-                 scenes_storeScene_commandParams.put("sceneId",scenes_storeScene_sceneId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_storeScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .storeScene((ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback
-                           ,  scenes_storeScene_commandParams.get("groupId") commandArguments.get("groupId")
-                           ,  scenes_storeScene_commandParams.get("sceneId") commandArguments.get("sceneId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_storeScene_commandParams
-           );
-           scenes_ClusterCommandInfo.put("storeScene", scenes_storeScene_CommandInfo);
-           Map<String, CommandParameter> scenes_viewScene_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter scenes_viewScene_commandParameter = new CommandParameter("Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
-                 CommandParameter scenes_viewScene_groupId_commandParameter = new CommandParameter("groupId", int.class);
-                 scenes_viewScene_commandParams.put("groupId",scenes_viewScene_groupId_commandParameter);
-                  
-                 CommandParameter scenes_viewScene_sceneId_commandParameter = new CommandParameter("sceneId", int.class);
-                 scenes_viewScene_commandParams.put("sceneId",scenes_viewScene_sceneId_commandParameter);
-                 
-           // Populate commands
-           CommandInfo scenes_viewScene_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ScenesCluster) cluster)
-                           .viewScene((ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback
-                           ,  scenes_viewScene_commandParams.get("groupId") commandArguments.get("groupId")
-                           ,  scenes_viewScene_commandParams.get("sceneId") commandArguments.get("sceneId")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   scenes_viewScene_commandParams
-           );
-           scenes_ClusterCommandInfo.put("viewScene", scenes_viewScene_CommandInfo);
-     // Populate cluster
-     ClusterInfo scenes_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ScenesCluster(ptr, endpointId), scenes_ClusterCommandInfo);
-     clusterMap.put("scenes", scenes_clusterInfo);
-     Map<String, CommandInfo> softwareDiagnostics_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> softwareDiagnostics_resetWatermarks_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter softwareDiagnostics_resetWatermarks_commandParameter = new CommandParameter("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo softwareDiagnostics_resetWatermarks_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.SoftwareDiagnosticsCluster) cluster)
-                          .resetWatermarks((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   softwareDiagnostics_resetWatermarks_commandParams
-           );
-           softwareDiagnostics_ClusterCommandInfo.put("resetWatermarks", softwareDiagnostics_resetWatermarks_CommandInfo);
-     // Populate cluster
-     ClusterInfo softwareDiagnostics_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.SoftwareDiagnosticsCluster(ptr, endpointId), softwareDiagnostics_ClusterCommandInfo);
-     clusterMap.put("softwareDiagnostics", softwareDiagnostics_clusterInfo);
-     Map<String, CommandInfo> switch_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo switch_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.SwitchCluster(ptr, endpointId), switch_ClusterCommandInfo);
-     clusterMap.put("switch", switch_clusterInfo);
-     Map<String, CommandInfo> tvChannel_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> tvChannel_changeChannel_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter tvChannel_changeChannel_commandParameter = new CommandParameter("TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
-                 CommandParameter tvChannel_changeChannel_match_commandParameter = new CommandParameter("match", String.class);
-                 tvChannel_changeChannel_commandParams.put("match",tvChannel_changeChannel_match_commandParameter);
-                 
-           // Populate commands
-           CommandInfo tvChannel_changeChannel_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TvChannelCluster) cluster)
-                           .changeChannel((ChipClusters.TvChannelCluster.ChangeChannelResponseCallback) callback
-                           ,  tvChannel_changeChannel_commandParams.get("match") commandArguments.get("match")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   tvChannel_changeChannel_commandParams
-           );
-           tvChannel_ClusterCommandInfo.put("changeChannel", tvChannel_changeChannel_CommandInfo);
-           Map<String, CommandParameter> tvChannel_changeChannelByNumber_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter tvChannel_changeChannelByNumber_commandParameter = new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter tvChannel_changeChannelByNumber_majorNumber_commandParameter = new CommandParameter("majorNumber", int.class);
-                 tvChannel_changeChannelByNumber_commandParams.put("majorNumber",tvChannel_changeChannelByNumber_majorNumber_commandParameter);
-                  
-                 CommandParameter tvChannel_changeChannelByNumber_minorNumber_commandParameter = new CommandParameter("minorNumber", int.class);
-                 tvChannel_changeChannelByNumber_commandParams.put("minorNumber",tvChannel_changeChannelByNumber_minorNumber_commandParameter);
-                 
-           // Populate commands
-           CommandInfo tvChannel_changeChannelByNumber_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TvChannelCluster) cluster)
-                          .changeChannelByNumber((DefaultClusterCallback) callback
-                          ,  tvChannel_changeChannelByNumber_commandParams.get("majorNumber") commandArguments.get("majorNumber")
-                          ,  tvChannel_changeChannelByNumber_commandParams.get("minorNumber") commandArguments.get("minorNumber")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   tvChannel_changeChannelByNumber_commandParams
-           );
-           tvChannel_ClusterCommandInfo.put("changeChannelByNumber", tvChannel_changeChannelByNumber_CommandInfo);
-           Map<String, CommandParameter> tvChannel_skipChannel_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter tvChannel_skipChannel_commandParameter = new CommandParameter("TvChannel", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter tvChannel_skipChannel_count_commandParameter = new CommandParameter("count", int.class);
-                 tvChannel_skipChannel_commandParams.put("count",tvChannel_skipChannel_count_commandParameter);
-                 
-           // Populate commands
-           CommandInfo tvChannel_skipChannel_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TvChannelCluster) cluster)
-                          .skipChannel((DefaultClusterCallback) callback
-                          ,  tvChannel_skipChannel_commandParams.get("count") commandArguments.get("count")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   tvChannel_skipChannel_commandParams
-           );
-           tvChannel_ClusterCommandInfo.put("skipChannel", tvChannel_skipChannel_CommandInfo);
-     // Populate cluster
-     ClusterInfo tvChannel_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.TvChannelCluster(ptr, endpointId), tvChannel_ClusterCommandInfo);
-     clusterMap.put("tvChannel", tvChannel_clusterInfo);
-     Map<String, CommandInfo> targetNavigator_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> targetNavigator_navigateTarget_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter targetNavigator_navigateTarget_commandParameter = new CommandParameter("TargetNavigator", ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback.class);
-                 CommandParameter targetNavigator_navigateTarget_target_commandParameter = new CommandParameter("target", int.class);
-                 targetNavigator_navigateTarget_commandParams.put("target",targetNavigator_navigateTarget_target_commandParameter);
-                  
-                 CommandParameter targetNavigator_navigateTarget_data_commandParameter = new CommandParameter("data", String.class);
-                 targetNavigator_navigateTarget_commandParams.put("data",targetNavigator_navigateTarget_data_commandParameter);
-                 
-           // Populate commands
-           CommandInfo targetNavigator_navigateTarget_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TargetNavigatorCluster) cluster)
-                           .navigateTarget((ChipClusters.TargetNavigatorCluster.NavigateTargetResponseCallback) callback
-                           ,  targetNavigator_navigateTarget_commandParams.get("target") commandArguments.get("target")
-                           ,  targetNavigator_navigateTarget_commandParams.get("data") commandArguments.get("data")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   targetNavigator_navigateTarget_commandParams
-           );
-           targetNavigator_ClusterCommandInfo.put("navigateTarget", targetNavigator_navigateTarget_CommandInfo);
-     // Populate cluster
-     ClusterInfo targetNavigator_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.TargetNavigatorCluster(ptr, endpointId), targetNavigator_ClusterCommandInfo);
-     clusterMap.put("targetNavigator", targetNavigator_clusterInfo);
-     Map<String, CommandInfo> temperatureMeasurement_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo temperatureMeasurement_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.TemperatureMeasurementCluster(ptr, endpointId), temperatureMeasurement_ClusterCommandInfo);
-     clusterMap.put("temperatureMeasurement", temperatureMeasurement_clusterInfo);
-     Map<String, CommandInfo> testCluster_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> testCluster_test_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter testCluster_test_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo testCluster_test_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TestClusterCluster) cluster)
-                          .test((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   testCluster_test_commandParams
-           );
-           testCluster_ClusterCommandInfo.put("test", testCluster_test_CommandInfo);
-           Map<String, CommandParameter> testCluster_testAddArguments_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter testCluster_testAddArguments_commandParameter = new CommandParameter("TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
-                 CommandParameter testCluster_testAddArguments_arg1_commandParameter = new CommandParameter("arg1", int.class);
-                 testCluster_testAddArguments_commandParams.put("arg1",testCluster_testAddArguments_arg1_commandParameter);
-                  
-                 CommandParameter testCluster_testAddArguments_arg2_commandParameter = new CommandParameter("arg2", int.class);
-                 testCluster_testAddArguments_commandParams.put("arg2",testCluster_testAddArguments_arg2_commandParameter);
-                 
-           // Populate commands
-           CommandInfo testCluster_testAddArguments_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TestClusterCluster) cluster)
-                           .testAddArguments((ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback) callback
-                           ,  testCluster_testAddArguments_commandParams.get("arg1") commandArguments.get("arg1")
-                           ,  testCluster_testAddArguments_commandParams.get("arg2") commandArguments.get("arg2")
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   testCluster_testAddArguments_commandParams
-           );
-           testCluster_ClusterCommandInfo.put("testAddArguments", testCluster_testAddArguments_CommandInfo);
-           Map<String, CommandParameter> testCluster_testNotHandled_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter testCluster_testNotHandled_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo testCluster_testNotHandled_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TestClusterCluster) cluster)
-                          .testNotHandled((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   testCluster_testNotHandled_commandParams
-           );
-           testCluster_ClusterCommandInfo.put("testNotHandled", testCluster_testNotHandled_CommandInfo);
-           Map<String, CommandParameter> testCluster_testSpecific_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter testCluster_testSpecific_commandParameter = new CommandParameter("TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
-           // Populate commands
-           CommandInfo testCluster_testSpecific_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TestClusterCluster) cluster)
-                           .testSpecific((ChipClusters.TestClusterCluster.TestSpecificResponseCallback) callback
-                       );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   testCluster_testSpecific_commandParams
-           );
-           testCluster_ClusterCommandInfo.put("testSpecific", testCluster_testSpecific_CommandInfo);
-           Map<String, CommandParameter> testCluster_testUnknownCommand_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter testCluster_testUnknownCommand_commandParameter = new CommandParameter("TestCluster", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo testCluster_testUnknownCommand_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.TestClusterCluster) cluster)
-                          .testUnknownCommand((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   testCluster_testUnknownCommand_commandParams
-           );
-           testCluster_ClusterCommandInfo.put("testUnknownCommand", testCluster_testUnknownCommand_CommandInfo);
-     // Populate cluster
-     ClusterInfo testCluster_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.TestClusterCluster(ptr, endpointId), testCluster_ClusterCommandInfo);
-     clusterMap.put("testCluster", testCluster_clusterInfo);
-     Map<String, CommandInfo> thermostat_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> thermostat_clearWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter thermostat_clearWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo thermostat_clearWeeklySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThermostatCluster) cluster)
-                          .clearWeeklySchedule((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   thermostat_clearWeeklySchedule_commandParams
-           );
-           thermostat_ClusterCommandInfo.put("clearWeeklySchedule", thermostat_clearWeeklySchedule_CommandInfo);
-           Map<String, CommandParameter> thermostat_getRelayStatusLog_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter thermostat_getRelayStatusLog_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo thermostat_getRelayStatusLog_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThermostatCluster) cluster)
-                          .getRelayStatusLog((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   thermostat_getRelayStatusLog_commandParams
-           );
-           thermostat_ClusterCommandInfo.put("getRelayStatusLog", thermostat_getRelayStatusLog_CommandInfo);
-           Map<String, CommandParameter> thermostat_getWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter thermostat_getWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter thermostat_getWeeklySchedule_daysToReturn_commandParameter = new CommandParameter("daysToReturn", int.class);
-                 thermostat_getWeeklySchedule_commandParams.put("daysToReturn",thermostat_getWeeklySchedule_daysToReturn_commandParameter);
-                  
-                 CommandParameter thermostat_getWeeklySchedule_modeToReturn_commandParameter = new CommandParameter("modeToReturn", int.class);
-                 thermostat_getWeeklySchedule_commandParams.put("modeToReturn",thermostat_getWeeklySchedule_modeToReturn_commandParameter);
-                 
-           // Populate commands
-           CommandInfo thermostat_getWeeklySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThermostatCluster) cluster)
-                          .getWeeklySchedule((DefaultClusterCallback) callback
-                          ,  thermostat_getWeeklySchedule_commandParams.get("daysToReturn") commandArguments.get("daysToReturn")
-                          ,  thermostat_getWeeklySchedule_commandParams.get("modeToReturn") commandArguments.get("modeToReturn")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   thermostat_getWeeklySchedule_commandParams
-           );
-           thermostat_ClusterCommandInfo.put("getWeeklySchedule", thermostat_getWeeklySchedule_CommandInfo);
-           Map<String, CommandParameter> thermostat_setWeeklySchedule_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter thermostat_setWeeklySchedule_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter = new CommandParameter("numberOfTransitionsForSequence", int.class);
-                 thermostat_setWeeklySchedule_commandParams.put("numberOfTransitionsForSequence",thermostat_setWeeklySchedule_numberOfTransitionsForSequence_commandParameter);
-                  
-                 CommandParameter thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter = new CommandParameter("dayOfWeekForSequence", int.class);
-                 thermostat_setWeeklySchedule_commandParams.put("dayOfWeekForSequence",thermostat_setWeeklySchedule_dayOfWeekForSequence_commandParameter);
-                  
-                 CommandParameter thermostat_setWeeklySchedule_modeForSequence_commandParameter = new CommandParameter("modeForSequence", int.class);
-                 thermostat_setWeeklySchedule_commandParams.put("modeForSequence",thermostat_setWeeklySchedule_modeForSequence_commandParameter);
-                  
-                 CommandParameter thermostat_setWeeklySchedule_payload_commandParameter = new CommandParameter("payload", int.class);
-                 thermostat_setWeeklySchedule_commandParams.put("payload",thermostat_setWeeklySchedule_payload_commandParameter);
-                 
-           // Populate commands
-           CommandInfo thermostat_setWeeklySchedule_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThermostatCluster) cluster)
-                          .setWeeklySchedule((DefaultClusterCallback) callback
-                          ,  thermostat_setWeeklySchedule_commandParams.get("numberOfTransitionsForSequence") commandArguments.get("numberOfTransitionsForSequence")
-                          ,  thermostat_setWeeklySchedule_commandParams.get("dayOfWeekForSequence") commandArguments.get("dayOfWeekForSequence")
-                          ,  thermostat_setWeeklySchedule_commandParams.get("modeForSequence") commandArguments.get("modeForSequence")
-                          ,  thermostat_setWeeklySchedule_commandParams.get("payload") commandArguments.get("payload")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   thermostat_setWeeklySchedule_commandParams
-           );
-           thermostat_ClusterCommandInfo.put("setWeeklySchedule", thermostat_setWeeklySchedule_CommandInfo);
-           Map<String, CommandParameter> thermostat_setpointRaiseLower_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter thermostat_setpointRaiseLower_commandParameter = new CommandParameter("Thermostat", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter thermostat_setpointRaiseLower_mode_commandParameter = new CommandParameter("mode", int.class);
-                 thermostat_setpointRaiseLower_commandParams.put("mode",thermostat_setpointRaiseLower_mode_commandParameter);
-                  
-                 CommandParameter thermostat_setpointRaiseLower_amount_commandParameter = new CommandParameter("amount", int.class);
-                 thermostat_setpointRaiseLower_commandParams.put("amount",thermostat_setpointRaiseLower_amount_commandParameter);
-                 
-           // Populate commands
-           CommandInfo thermostat_setpointRaiseLower_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThermostatCluster) cluster)
-                          .setpointRaiseLower((DefaultClusterCallback) callback
-                          ,  thermostat_setpointRaiseLower_commandParams.get("mode") commandArguments.get("mode")
-                          ,  thermostat_setpointRaiseLower_commandParams.get("amount") commandArguments.get("amount")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   thermostat_setpointRaiseLower_commandParams
-           );
-           thermostat_ClusterCommandInfo.put("setpointRaiseLower", thermostat_setpointRaiseLower_CommandInfo);
-     // Populate cluster
-     ClusterInfo thermostat_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ThermostatCluster(ptr, endpointId), thermostat_ClusterCommandInfo);
-     clusterMap.put("thermostat", thermostat_clusterInfo);
-     Map<String, CommandInfo> thermostatUserInterfaceConfiguration_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo thermostatUserInterfaceConfiguration_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ThermostatUserInterfaceConfigurationCluster(ptr, endpointId), thermostatUserInterfaceConfiguration_ClusterCommandInfo);
-     clusterMap.put("thermostatUserInterfaceConfiguration", thermostatUserInterfaceConfiguration_clusterInfo);
-     Map<String, CommandInfo> threadNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> threadNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter threadNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo threadNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.ThreadNetworkDiagnosticsCluster) cluster)
-                          .resetCounts((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   threadNetworkDiagnostics_resetCounts_commandParams
-           );
-           threadNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", threadNetworkDiagnostics_resetCounts_CommandInfo);
-     // Populate cluster
-     ClusterInfo threadNetworkDiagnostics_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.ThreadNetworkDiagnosticsCluster(ptr, endpointId), threadNetworkDiagnostics_ClusterCommandInfo);
-     clusterMap.put("threadNetworkDiagnostics", threadNetworkDiagnostics_clusterInfo);
-     Map<String, CommandInfo> wakeOnLan_ClusterCommandInfo = new HashMap<>();
-     // Populate cluster
-     ClusterInfo wakeOnLan_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.WakeOnLanCluster(ptr, endpointId), wakeOnLan_ClusterCommandInfo);
-     clusterMap.put("wakeOnLan", wakeOnLan_clusterInfo);
-     Map<String, CommandInfo> wiFiNetworkDiagnostics_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> wiFiNetworkDiagnostics_resetCounts_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter wiFiNetworkDiagnostics_resetCounts_commandParameter = new CommandParameter("WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo wiFiNetworkDiagnostics_resetCounts_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WiFiNetworkDiagnosticsCluster) cluster)
-                          .resetCounts((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   wiFiNetworkDiagnostics_resetCounts_commandParams
-           );
-           wiFiNetworkDiagnostics_ClusterCommandInfo.put("resetCounts", wiFiNetworkDiagnostics_resetCounts_CommandInfo);
-     // Populate cluster
-     ClusterInfo wiFiNetworkDiagnostics_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.WiFiNetworkDiagnosticsCluster(ptr, endpointId), wiFiNetworkDiagnostics_ClusterCommandInfo);
-     clusterMap.put("wiFiNetworkDiagnostics", wiFiNetworkDiagnostics_clusterInfo);
-     Map<String, CommandInfo> windowCovering_ClusterCommandInfo = new HashMap<>();
-           Map<String, CommandParameter> windowCovering_downOrClose_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_downOrClose_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo windowCovering_downOrClose_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .downOrClose((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_downOrClose_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("downOrClose", windowCovering_downOrClose_CommandInfo);
-           Map<String, CommandParameter> windowCovering_goToLiftPercentage_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_goToLiftPercentage_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter = new CommandParameter("liftPercentageValue", int.class);
-                 windowCovering_goToLiftPercentage_commandParams.put("liftPercentageValue",windowCovering_goToLiftPercentage_liftPercentageValue_commandParameter);
-                  
-                 CommandParameter windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter = new CommandParameter("liftPercent100thsValue", int.class);
-                 windowCovering_goToLiftPercentage_commandParams.put("liftPercent100thsValue",windowCovering_goToLiftPercentage_liftPercent100thsValue_commandParameter);
-                 
-           // Populate commands
-           CommandInfo windowCovering_goToLiftPercentage_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .goToLiftPercentage((DefaultClusterCallback) callback
-                          ,  windowCovering_goToLiftPercentage_commandParams.get("liftPercentageValue") commandArguments.get("liftPercentageValue")
-                          ,  windowCovering_goToLiftPercentage_commandParams.get("liftPercent100thsValue") commandArguments.get("liftPercent100thsValue")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_goToLiftPercentage_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("goToLiftPercentage", windowCovering_goToLiftPercentage_CommandInfo);
-           Map<String, CommandParameter> windowCovering_goToLiftValue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_goToLiftValue_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter windowCovering_goToLiftValue_liftValue_commandParameter = new CommandParameter("liftValue", int.class);
-                 windowCovering_goToLiftValue_commandParams.put("liftValue",windowCovering_goToLiftValue_liftValue_commandParameter);
-                 
-           // Populate commands
-           CommandInfo windowCovering_goToLiftValue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .goToLiftValue((DefaultClusterCallback) callback
-                          ,  windowCovering_goToLiftValue_commandParams.get("liftValue") commandArguments.get("liftValue")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_goToLiftValue_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("goToLiftValue", windowCovering_goToLiftValue_CommandInfo);
-           Map<String, CommandParameter> windowCovering_goToTiltPercentage_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_goToTiltPercentage_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter = new CommandParameter("tiltPercentageValue", int.class);
-                 windowCovering_goToTiltPercentage_commandParams.put("tiltPercentageValue",windowCovering_goToTiltPercentage_tiltPercentageValue_commandParameter);
-                  
-                 CommandParameter windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter = new CommandParameter("tiltPercent100thsValue", int.class);
-                 windowCovering_goToTiltPercentage_commandParams.put("tiltPercent100thsValue",windowCovering_goToTiltPercentage_tiltPercent100thsValue_commandParameter);
-                 
-           // Populate commands
-           CommandInfo windowCovering_goToTiltPercentage_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .goToTiltPercentage((DefaultClusterCallback) callback
-                          ,  windowCovering_goToTiltPercentage_commandParams.get("tiltPercentageValue") commandArguments.get("tiltPercentageValue")
-                          ,  windowCovering_goToTiltPercentage_commandParams.get("tiltPercent100thsValue") commandArguments.get("tiltPercent100thsValue")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_goToTiltPercentage_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("goToTiltPercentage", windowCovering_goToTiltPercentage_CommandInfo);
-           Map<String, CommandParameter> windowCovering_goToTiltValue_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_goToTiltValue_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-                 CommandParameter windowCovering_goToTiltValue_tiltValue_commandParameter = new CommandParameter("tiltValue", int.class);
-                 windowCovering_goToTiltValue_commandParams.put("tiltValue",windowCovering_goToTiltValue_tiltValue_commandParameter);
-                 
-           // Populate commands
-           CommandInfo windowCovering_goToTiltValue_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .goToTiltValue((DefaultClusterCallback) callback
-                          ,  windowCovering_goToTiltValue_commandParams.get("tiltValue") commandArguments.get("tiltValue")
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_goToTiltValue_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("goToTiltValue", windowCovering_goToTiltValue_CommandInfo);
-           Map<String, CommandParameter> windowCovering_stopMotion_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_stopMotion_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo windowCovering_stopMotion_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .stopMotion((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_stopMotion_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("stopMotion", windowCovering_stopMotion_CommandInfo);
-           Map<String, CommandParameter> windowCovering_upOrOpen_commandParams = new HashMap<String, CommandParameter>();
-           // TODO: fill out parameter types
-                 CommandParameter windowCovering_upOrOpen_commandParameter = new CommandParameter("WindowCovering", ChipClusters.DefaultClusterCallback.class);
-           // Populate commands
-           CommandInfo windowCovering_upOrOpen_CommandInfo = new CommandInfo(
-                   (cluster, callback, commandArguments) -> {
-                       ((ChipClusters.WindowCoveringCluster) cluster)
-                          .upOrOpen((DefaultClusterCallback) callback
-                );
-                   },
-                   () -> new DelegatedDefaultClusterCallback(),
-                   windowCovering_upOrOpen_commandParams
-           );
-           windowCovering_ClusterCommandInfo.put("upOrOpen", windowCovering_upOrOpen_CommandInfo);
-     // Populate cluster
-     ClusterInfo windowCovering_clusterInfo = new ClusterInfo(
-          (ptr, endpointId) -> new ChipClusters.WindowCoveringCluster(ptr, endpointId), windowCovering_ClusterCommandInfo);
-     clusterMap.put("windowCovering", windowCovering_clusterInfo);
-     return clusterMap;
->>>>>>> e83b94d19 (need to wait for cast-helper)
-=======
->>>>>>> 677ef48a5 (callback generation done)
   }
 }

From 7a86db81e038ec49090bef367cbf76854cf88ac5 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 28 Oct 2021 13:48:47 -0400
Subject: [PATCH 34/38] remove duplicate todo

---
 .../java/templates/ClusterInfo-java.zapt      |   2 +-
 .../devicecontroller/ClusterInfoMapping.java  | 174 ------------------
 2 files changed, 1 insertion(+), 175 deletions(-)

diff --git a/src/controller/java/templates/ClusterInfo-java.zapt b/src/controller/java/templates/ClusterInfo-java.zapt
index 6d852b8a36dbc0..f0be88b6ac04ac 100644
--- a/src/controller/java/templates/ClusterInfo-java.zapt
+++ b/src/controller/java/templates/ClusterInfo-java.zapt
@@ -90,7 +90,7 @@ public class ClusterInfoMapping {
      Map<String, CommandInfo> {{asLowerCamelCase name}}ClusterCommandInfoMap = new LinkedHashMap<>();
      {{#chip_cluster_commands}}
      Map<String, CommandParameterInfo> {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParams = new LinkedHashMap<String, CommandParameterInfo>();
-     // TODO: fill out parameter types
+     {{! TODO: fill out parameter types }}
      {{#if (zcl_command_arguments_count this.id)}}
      {{#if hasSpecificResponse}}
        CommandParameterInfo {{asLowerCamelCase ../name}}{{asLowerCamelCase name}}CommandParameterInfo = new CommandParameterInfo("{{asUpperCamelCase ../name}}", ChipClusters.{{asUpperCamelCase ../name}}Cluster.{{asUpperCamelCase responseName}}Callback.class);
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 27a757a2a31c92..aff1174d18ec04 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -1913,7 +1913,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> accountLoginClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> accountLogingetSetupPINCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo accountLogingetSetupPINCommandParameterInfo =
         new CommandParameterInfo(
             "AccountLogin", ChipClusters.AccountLoginCluster.GetSetupPINResponseCallback.class);
@@ -1936,7 +1935,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     accountLoginClusterCommandInfoMap.put("getSetupPIN", accountLogingetSetupPINCommandInfo);
     Map<String, CommandParameterInfo> accountLoginloginCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo accountLoginloginCommandParameterInfo =
         new CommandParameterInfo("AccountLogin", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo accountLoginlogintempAccountIdentifierCommandParameterInfo =
@@ -1972,7 +1970,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenBasicCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo
         administratorCommissioningopenBasicCommissioningWindowCommandParameterInfo =
             new CommandParameterInfo(
@@ -2001,7 +1998,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         administratorCommissioningopenCommissioningWindowCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo administratorCommissioningopenCommissioningWindowCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2065,7 +2061,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "openCommissioningWindow", administratorCommissioningopenCommissioningWindowCommandInfo);
     Map<String, CommandParameterInfo> administratorCommissioningrevokeCommissioningCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo administratorCommissioningrevokeCommissioningCommandParameterInfo =
         new CommandParameterInfo(
             "AdministratorCommissioning", ChipClusters.DefaultClusterCallback.class);
@@ -2090,7 +2085,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationBasicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationBasicchangeStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo applicationBasicchangeStatusCommandParameterInfo =
         new CommandParameterInfo("ApplicationBasic", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo applicationBasicchangeStatusstatusCommandParameterInfo =
@@ -2119,7 +2113,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> applicationLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> applicationLauncherlaunchAppCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo applicationLauncherlaunchAppCommandParameterInfo =
         new CommandParameterInfo(
             "ApplicationLauncher",
@@ -2163,7 +2156,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> audioOutputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> audioOutputrenameOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo audioOutputrenameOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputrenameOutputindexCommandParameterInfo =
@@ -2191,7 +2183,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     audioOutputClusterCommandInfoMap.put("renameOutput", audioOutputrenameOutputCommandInfo);
     Map<String, CommandParameterInfo> audioOutputselectOutputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo audioOutputselectOutputCommandParameterInfo =
         new CommandParameterInfo("AudioOutput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo audioOutputselectOutputindexCommandParameterInfo =
@@ -2219,7 +2210,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> barrierControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> barrierControlbarrierControlGoToPercentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlGoToPercentCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo barrierControlbarrierControlGoToPercentpercentOpenCommandParameterInfo =
@@ -2242,7 +2232,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "barrierControlGoToPercent", barrierControlbarrierControlGoToPercentCommandInfo);
     Map<String, CommandParameterInfo> barrierControlbarrierControlStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo barrierControlbarrierControlStopCommandParameterInfo =
         new CommandParameterInfo("BarrierControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2265,7 +2254,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> basicClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> basicmfgSpecificPingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo basicmfgSpecificPingCommandParameterInfo =
         new CommandParameterInfo("Basic", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -2294,7 +2282,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bindingClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bindingbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bindingbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingbindnodeIdCommandParameterInfo =
@@ -2330,7 +2317,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bindingClusterCommandInfoMap.put("bind", bindingbindCommandInfo);
     Map<String, CommandParameterInfo> bindingunbindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bindingunbindCommandParameterInfo =
         new CommandParameterInfo("Binding", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bindingunbindnodeIdCommandParameterInfo =
@@ -2380,7 +2366,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> bridgedActionsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> bridgedActionsdisableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionactionIDCommandParameterInfo =
@@ -2409,7 +2394,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableAction", bridgedActionsdisableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsdisableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsdisableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsdisableActionWithDurationactionIDCommandParameterInfo =
@@ -2444,7 +2428,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableActionWithDuration", bridgedActionsdisableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionactionIDCommandParameterInfo =
@@ -2472,7 +2455,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("enableAction", bridgedActionsenableActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsenableActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsenableActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsenableActionWithDurationactionIDCommandParameterInfo =
@@ -2507,7 +2489,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enableActionWithDuration", bridgedActionsenableActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionactionIDCommandParameterInfo =
@@ -2536,7 +2517,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantAction", bridgedActionsinstantActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsinstantActionWithTransitionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsinstantActionWithTransitionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsinstantActionWithTransitionactionIDCommandParameterInfo =
@@ -2573,7 +2553,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "instantActionWithTransition", bridgedActionsinstantActionWithTransitionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionactionIDCommandParameterInfo =
@@ -2601,7 +2580,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("pauseAction", bridgedActionspauseActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionspauseActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionspauseActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionspauseActionWithDurationactionIDCommandParameterInfo =
@@ -2636,7 +2614,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "pauseActionWithDuration", bridgedActionspauseActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsresumeActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsresumeActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsresumeActionactionIDCommandParameterInfo =
@@ -2664,7 +2641,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("resumeAction", bridgedActionsresumeActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionactionIDCommandParameterInfo =
@@ -2692,7 +2668,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     bridgedActionsClusterCommandInfoMap.put("startAction", bridgedActionsstartActionCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstartActionWithDurationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstartActionWithDurationCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstartActionWithDurationactionIDCommandParameterInfo =
@@ -2727,7 +2702,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "startActionWithDuration", bridgedActionsstartActionWithDurationCommandInfo);
     Map<String, CommandParameterInfo> bridgedActionsstopActionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo bridgedActionsstopActionCommandParameterInfo =
         new CommandParameterInfo("BridgedActions", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo bridgedActionsstopActionactionIDCommandParameterInfo =
@@ -2769,7 +2743,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> colorControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> colorControlcolorLoopSetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlcolorLoopSetCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlcolorLoopSetupdateFlagsCommandParameterInfo =
@@ -2827,7 +2800,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("colorLoopSet", colorControlcolorLoopSetCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveHuemoveModeCommandParameterInfo =
@@ -2868,7 +2840,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveHue", colorControlenhancedMoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueenhancedHueCommandParameterInfo =
@@ -2915,7 +2886,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHue", colorControlenhancedMoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedMoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedMoveToHueAndSaturationenhancedHueCommandParameterInfo =
@@ -2966,7 +2936,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedMoveToHueAndSaturation", colorControlenhancedMoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlenhancedStepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlenhancedStepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlenhancedStepHuestepModeCommandParameterInfo =
@@ -3013,7 +2982,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "enhancedStepHue", colorControlenhancedStepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorrateXCommandParameterInfo =
@@ -3051,7 +3019,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveColor", colorControlmoveColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveColorTemperaturemoveModeCommandParameterInfo =
@@ -3108,7 +3075,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveColorTemperature", colorControlmoveColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveHuemoveModeCommandParameterInfo =
@@ -3147,7 +3113,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveHue", colorControlmoveHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveSaturationmoveModeCommandParameterInfo =
@@ -3187,7 +3152,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveSaturation", colorControlmoveSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorcolorXCommandParameterInfo =
@@ -3233,7 +3197,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToColor", colorControlmoveToColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToColorTemperaturecolorTemperatureCommandParameterInfo =
@@ -3274,7 +3237,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToColorTemperature", colorControlmoveToColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHuehueCommandParameterInfo =
@@ -3319,7 +3281,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("moveToHue", colorControlmoveToHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToHueAndSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToHueAndSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToHueAndSaturationhueCommandParameterInfo =
@@ -3366,7 +3327,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToHueAndSaturation", colorControlmoveToHueAndSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlmoveToSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlmoveToSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlmoveToSaturationsaturationCommandParameterInfo =
@@ -3407,7 +3367,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToSaturation", colorControlmoveToSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepColorCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorstepXCommandParameterInfo =
@@ -3451,7 +3410,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepColor", colorControlstepColorCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepColorTemperatureCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepColorTemperatureCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepColorTemperaturestepModeCommandParameterInfo =
@@ -3514,7 +3472,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "stepColorTemperature", colorControlstepColorTemperatureCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepHueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepHueCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepHuestepModeCommandParameterInfo =
@@ -3560,7 +3517,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepHue", colorControlstepHueCommandInfo);
     Map<String, CommandParameterInfo> colorControlstepSaturationCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlstepSaturationCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstepSaturationstepModeCommandParameterInfo =
@@ -3606,7 +3562,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     colorControlClusterCommandInfoMap.put("stepSaturation", colorControlstepSaturationCommandInfo);
     Map<String, CommandParameterInfo> colorControlstopMoveStepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo colorControlstopMoveStepCommandParameterInfo =
         new CommandParameterInfo("ColorControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo colorControlstopMoveStepoptionsMaskCommandParameterInfo =
@@ -3641,7 +3596,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> contentLauncherClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> contentLauncherlaunchContentCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo contentLauncherlaunchContentCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher",
@@ -3672,7 +3626,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "launchContent", contentLauncherlaunchContentCommandInfo);
     Map<String, CommandParameterInfo> contentLauncherlaunchURLCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo contentLauncherlaunchURLCommandParameterInfo =
         new CommandParameterInfo(
             "ContentLauncher", ChipClusters.ContentLauncherCluster.LaunchURLResponseCallback.class);
@@ -3715,7 +3668,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> diagnosticLogsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> diagnosticLogsretrieveLogsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo diagnosticLogsretrieveLogsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "DiagnosticLogs",
@@ -3762,7 +3714,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> doorLockClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> doorLockclearAllPinsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearAllPinsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllPinsResponseCallback.class);
@@ -3779,7 +3730,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllPins", doorLockclearAllPinsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearAllRfidsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearAllRfidsCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearAllRfidsResponseCallback.class);
@@ -3796,7 +3746,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearAllRfids", doorLockclearAllRfidsCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearHolidayScheduleResponseCallback.class);
@@ -3820,7 +3769,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearHolidaySchedule", doorLockclearHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearPinResponseCallback.class);
@@ -3842,7 +3790,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearPin", doorLockclearPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearRfidResponseCallback.class);
@@ -3864,7 +3811,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("clearRfid", doorLockclearRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearWeekdayScheduleResponseCallback.class);
@@ -3894,7 +3840,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeekdaySchedule", doorLockclearWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockclearYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockclearYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.ClearYeardayScheduleResponseCallback.class);
@@ -3924,7 +3869,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearYeardaySchedule", doorLockclearYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetHolidayScheduleResponseCallback.class);
@@ -3947,7 +3891,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getHolidaySchedule", doorLockgetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetLogRecordCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetLogRecordCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetLogRecordResponseCallback.class);
@@ -3970,7 +3913,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getLogRecord", doorLockgetLogRecordCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetPinResponseCallback.class);
@@ -3992,7 +3934,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getPin", doorLockgetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetRfidResponseCallback.class);
@@ -4014,7 +3955,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getRfid", doorLockgetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetUserTypeResponseCallback.class);
@@ -4036,7 +3976,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getUserType", doorLockgetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetWeekdayScheduleResponseCallback.class);
@@ -4065,7 +4004,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getWeekdaySchedule", doorLockgetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockgetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockgetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.GetYeardayScheduleResponseCallback.class);
@@ -4094,7 +4032,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("getYeardaySchedule", doorLockgetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocklockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocklockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.LockDoorResponseCallback.class);
@@ -4116,7 +4053,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("lockDoor", doorLocklockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetHolidayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetHolidayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetHolidayScheduleResponseCallback.class);
@@ -4158,7 +4094,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setHolidaySchedule", doorLocksetHolidayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetPinCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetPinCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetPinResponseCallback.class);
@@ -4195,7 +4130,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setPin", doorLocksetPinCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetRfidCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetRfidCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetRfidResponseCallback.class);
@@ -4232,7 +4166,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setRfid", doorLocksetRfidCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetUserTypeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetUserTypeCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetUserTypeResponseCallback.class);
@@ -4260,7 +4193,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setUserType", doorLocksetUserTypeCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetWeekdayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetWeekdayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetWeekdayScheduleResponseCallback.class);
@@ -4319,7 +4251,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setWeekdaySchedule", doorLocksetWeekdayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLocksetYeardayScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLocksetYeardayScheduleCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.SetYeardayScheduleResponseCallback.class);
@@ -4360,7 +4291,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("setYeardaySchedule", doorLocksetYeardayScheduleCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockDoorCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockunlockDoorCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockDoorResponseCallback.class);
@@ -4382,7 +4312,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     doorLockClusterCommandInfoMap.put("unlockDoor", doorLockunlockDoorCommandInfo);
     Map<String, CommandParameterInfo> doorLockunlockWithTimeoutCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo doorLockunlockWithTimeoutCommandParameterInfo =
         new CommandParameterInfo(
             "DoorLock", ChipClusters.DoorLockCluster.UnlockWithTimeoutResponseCallback.class);
@@ -4426,7 +4355,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> ethernetNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo ethernetNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "EthernetNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -4465,7 +4393,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> generalCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> generalCommissioningarmFailSafeCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningarmFailSafeCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4504,7 +4431,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "armFailSafe", generalCommissioningarmFailSafeCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningcommissioningCompleteCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningcommissioningCompleteCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4525,7 +4451,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "commissioningComplete", generalCommissioningcommissioningCompleteCommandInfo);
     Map<String, CommandParameterInfo> generalCommissioningsetRegulatoryConfigCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo generalCommissioningsetRegulatoryConfigCommandParameterInfo =
         new CommandParameterInfo(
             "GeneralCommissioning",
@@ -4590,7 +4515,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> groupsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> groupsaddGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsaddGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.AddGroupResponseCallback.class);
@@ -4617,7 +4541,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("addGroup", groupsaddGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsaddGroupIfIdentifyingCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsaddGroupIfIdentifyingCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo groupsaddGroupIfIdentifyinggroupIdCommandParameterInfo =
@@ -4646,7 +4569,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addGroupIfIdentifying", groupsaddGroupIfIdentifyingCommandInfo);
     Map<String, CommandParameterInfo> groupsgetGroupMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsgetGroupMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.GetGroupMembershipResponseCallback.class);
@@ -4675,7 +4597,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("getGroupMembership", groupsgetGroupMembershipCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveAllGroupsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsremoveAllGroupsCommandParameterInfo =
         new CommandParameterInfo("Groups", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -4690,7 +4611,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeAllGroups", groupsremoveAllGroupsCommandInfo);
     Map<String, CommandParameterInfo> groupsremoveGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsremoveGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.RemoveGroupResponseCallback.class);
@@ -4712,7 +4632,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     groupsClusterCommandInfoMap.put("removeGroup", groupsremoveGroupCommandInfo);
     Map<String, CommandParameterInfo> groupsviewGroupCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo groupsviewGroupCommandParameterInfo =
         new CommandParameterInfo(
             "Groups", ChipClusters.GroupsCluster.ViewGroupResponseCallback.class);
@@ -4741,7 +4660,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> identifyClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> identifyidentifyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo identifyidentifyCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifyidentifyidentifyTimeCommandParameterInfo =
@@ -4763,7 +4681,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identify", identifyidentifyCommandInfo);
     Map<String, CommandParameterInfo> identifyidentifyQueryCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo identifyidentifyQueryCommandParameterInfo =
         new CommandParameterInfo(
             "Identify", ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback.class);
@@ -4780,7 +4697,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     identifyClusterCommandInfoMap.put("identifyQuery", identifyidentifyQueryCommandInfo);
     Map<String, CommandParameterInfo> identifytriggerEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo identifytriggerEffectCommandParameterInfo =
         new CommandParameterInfo("Identify", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo =
@@ -4822,7 +4738,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> keypadInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> keypadInputsendKeyCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo keypadInputsendKeyCommandParameterInfo =
         new CommandParameterInfo(
             "KeypadInput", ChipClusters.KeypadInputCluster.SendKeyResponseCallback.class);
@@ -4851,7 +4766,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> levelControlClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> levelControlmoveCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmovemoveModeCommandParameterInfo =
@@ -4888,7 +4802,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("move", levelControlmoveCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevellevelCommandParameterInfo =
@@ -4928,7 +4841,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveToLevel", levelControlmoveToLevelCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveToLevelWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveToLevelWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveToLevelWithOnOfflevelCommandParameterInfo =
@@ -4957,7 +4869,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "moveToLevelWithOnOff", levelControlmoveToLevelWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlmoveWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlmoveWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlmoveWithOnOffmoveModeCommandParameterInfo =
@@ -4985,7 +4896,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("moveWithOnOff", levelControlmoveWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlstepCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepstepModeCommandParameterInfo =
@@ -5028,7 +4938,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("step", levelControlstepCommandInfo);
     Map<String, CommandParameterInfo> levelControlstepWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlstepWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstepWithOnOffstepModeCommandParameterInfo =
@@ -5062,7 +4971,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stepWithOnOff", levelControlstepWithOnOffCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlstopCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo levelControlstopoptionMaskCommandParameterInfo =
@@ -5089,7 +4997,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     levelControlClusterCommandInfoMap.put("stop", levelControlstopCommandInfo);
     Map<String, CommandParameterInfo> levelControlstopWithOnOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo levelControlstopWithOnOffCommandParameterInfo =
         new CommandParameterInfo("LevelControl", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5111,7 +5018,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> lowPowerClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> lowPowersleepCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo lowPowersleepCommandParameterInfo =
         new CommandParameterInfo("LowPower", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5132,7 +5038,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaInputClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaInputhideInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaInputhideInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5147,7 +5052,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("hideInputStatus", mediaInputhideInputStatusCommandInfo);
     Map<String, CommandParameterInfo> mediaInputrenameInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaInputrenameInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputrenameInputindexCommandParameterInfo =
@@ -5173,7 +5077,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("renameInput", mediaInputrenameInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputselectInputCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaInputselectInputCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo mediaInputselectInputindexCommandParameterInfo =
@@ -5193,7 +5096,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaInputClusterCommandInfoMap.put("selectInput", mediaInputselectInputCommandInfo);
     Map<String, CommandParameterInfo> mediaInputshowInputStatusCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaInputshowInputStatusCommandParameterInfo =
         new CommandParameterInfo("MediaInput", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -5215,7 +5117,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> mediaPlaybackClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> mediaPlaybackmediaFastForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaFastForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5235,7 +5136,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaFastForward", mediaPlaybackmediaFastForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaNextCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaNextCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaNextResponseCallback.class);
@@ -5252,7 +5152,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaNext", mediaPlaybackmediaNextCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPauseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPauseCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPauseResponseCallback.class);
@@ -5269,7 +5168,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPause", mediaPlaybackmediaPauseCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPlayCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPlayCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPlayResponseCallback.class);
@@ -5286,7 +5184,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPlay", mediaPlaybackmediaPlayCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaPreviousCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaPreviousCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaPreviousResponseCallback.class);
@@ -5303,7 +5200,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaPrevious", mediaPlaybackmediaPreviousCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaRewindCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaRewindCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaRewindResponseCallback.class);
@@ -5320,7 +5216,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaRewind", mediaPlaybackmediaRewindCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSeekCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSeekCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaSeekResponseCallback.class);
@@ -5343,7 +5238,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     mediaPlaybackClusterCommandInfoMap.put("mediaSeek", mediaPlaybackmediaSeekCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipBackwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipBackwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5371,7 +5265,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipBackward", mediaPlaybackmediaSkipBackwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaSkipForwardCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaSkipForwardCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5398,7 +5291,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaSkipForward", mediaPlaybackmediaSkipForwardCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStartOverCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStartOverCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback",
@@ -5417,7 +5309,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "mediaStartOver", mediaPlaybackmediaStartOverCommandInfo);
     Map<String, CommandParameterInfo> mediaPlaybackmediaStopCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo mediaPlaybackmediaStopCommandParameterInfo =
         new CommandParameterInfo(
             "MediaPlayback", ChipClusters.MediaPlaybackCluster.MediaStopResponseCallback.class);
@@ -5441,7 +5332,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> networkCommissioningClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> networkCommissioningaddThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningaddThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5481,7 +5371,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addThreadNetwork", networkCommissioningaddThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningaddWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningaddWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5525,7 +5414,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addWiFiNetwork", networkCommissioningaddWiFiNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningdisableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningdisableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5563,7 +5451,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "disableNetwork", networkCommissioningdisableNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningenableNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningenableNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5602,7 +5489,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         networkCommissioninggetLastNetworkCommissioningResultCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioninggetLastNetworkCommissioningResultCommandParameterInfo =
         new CommandParameterInfo("NetworkCommissioning", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -5627,7 +5513,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         networkCommissioninggetLastNetworkCommissioningResultCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningremoveNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningremoveNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5665,7 +5550,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "removeNetwork", networkCommissioningremoveNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningscanNetworksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningscanNetworksCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5703,7 +5587,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "scanNetworks", networkCommissioningscanNetworksCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateThreadNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningupdateThreadNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5743,7 +5626,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateThreadNetwork", networkCommissioningupdateThreadNetworkCommandInfo);
     Map<String, CommandParameterInfo> networkCommissioningupdateWiFiNetworkCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo networkCommissioningupdateWiFiNetworkCommandParameterInfo =
         new CommandParameterInfo(
             "NetworkCommissioning",
@@ -5794,7 +5676,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> otaSoftwareUpdateProviderClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderapplyUpdateRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderapplyUpdateRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5828,7 +5709,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "applyUpdateRequest", otaSoftwareUpdateProviderapplyUpdateRequestCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProvidernotifyUpdateAppliedCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider", ChipClusters.DefaultClusterCallback.class);
@@ -5861,7 +5741,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "notifyUpdateApplied", otaSoftwareUpdateProvidernotifyUpdateAppliedCommandInfo);
     Map<String, CommandParameterInfo> otaSoftwareUpdateProviderqueryImageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateProviderqueryImageCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateProvider",
@@ -5942,7 +5821,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         new LinkedHashMap<>();
     Map<String, CommandParameterInfo> otaSoftwareUpdateRequestorannounceOtaProviderCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo otaSoftwareUpdateRequestorannounceOtaProviderCommandParameterInfo =
         new CommandParameterInfo(
             "OtaSoftwareUpdateRequestor", ChipClusters.DefaultClusterCallback.class);
@@ -6005,7 +5883,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> onOffClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> onOffoffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOffoffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6019,7 +5896,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("off", onOffoffCommandInfo);
     Map<String, CommandParameterInfo> onOffoffWithEffectCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOffoffWithEffectCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffoffWithEffecteffectIdCommandParameterInfo =
@@ -6046,7 +5922,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("offWithEffect", onOffoffWithEffectCommandInfo);
     Map<String, CommandParameterInfo> onOffonCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOffonCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6060,7 +5935,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("on", onOffonCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithRecallGlobalSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOffonWithRecallGlobalSceneCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6076,7 +5950,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "onWithRecallGlobalScene", onOffonWithRecallGlobalSceneCommandInfo);
     Map<String, CommandParameterInfo> onOffonWithTimedOffCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOffonWithTimedOffCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo onOffonWithTimedOffonOffControlCommandParameterInfo =
@@ -6109,7 +5982,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     onOffClusterCommandInfoMap.put("onWithTimedOff", onOffonWithTimedOffCommandInfo);
     Map<String, CommandParameterInfo> onOfftoggleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo onOfftoggleCommandParameterInfo =
         new CommandParameterInfo("OnOff", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6137,7 +6009,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> operationalCredentialsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> operationalCredentialsaddNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsaddNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6186,7 +6057,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addNOC", operationalCredentialsaddNOCCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsaddTrustedRootCertificateCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsaddTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6212,7 +6082,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "addTrustedRootCertificate", operationalCredentialsaddTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsattestationRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsattestationRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6240,7 +6109,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "attestationRequest", operationalCredentialsattestationRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialscertificateChainRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialscertificateChainRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6268,7 +6136,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "certificateChainRequest", operationalCredentialscertificateChainRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsopCSRRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsopCSRRequestCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6293,7 +6160,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "opCSRRequest", operationalCredentialsopCSRRequestCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsremoveFabricCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveFabricCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6319,7 +6185,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandParameterInfo>
         operationalCredentialsremoveTrustedRootCertificateCommandParams =
             new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsremoveTrustedRootCertificateCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials", ChipClusters.DefaultClusterCallback.class);
@@ -6346,7 +6211,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         operationalCredentialsremoveTrustedRootCertificateCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateFabricLabelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateFabricLabelCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6371,7 +6235,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "updateFabricLabel", operationalCredentialsupdateFabricLabelCommandInfo);
     Map<String, CommandParameterInfo> operationalCredentialsupdateNOCCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo operationalCredentialsupdateNOCCommandParameterInfo =
         new CommandParameterInfo(
             "OperationalCredentials",
@@ -6441,7 +6304,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> scenesClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> scenesaddSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesaddSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.AddSceneResponseCallback.class);
@@ -6494,7 +6356,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("addScene", scenesaddSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesgetSceneMembershipCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesgetSceneMembershipCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback.class);
@@ -6517,7 +6378,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("getSceneMembership", scenesgetSceneMembershipCommandInfo);
     Map<String, CommandParameterInfo> scenesrecallSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesrecallSceneCommandParameterInfo =
         new CommandParameterInfo("Scenes", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo =
@@ -6549,7 +6409,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("recallScene", scenesrecallSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveAllScenesCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesremoveAllScenesCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback.class);
@@ -6572,7 +6431,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeAllScenes", scenesremoveAllScenesCommandInfo);
     Map<String, CommandParameterInfo> scenesremoveSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesremoveSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.RemoveSceneResponseCallback.class);
@@ -6599,7 +6457,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("removeScene", scenesremoveSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesstoreSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesstoreSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.StoreSceneResponseCallback.class);
@@ -6626,7 +6483,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     scenesClusterCommandInfoMap.put("storeScene", scenesstoreSceneCommandInfo);
     Map<String, CommandParameterInfo> scenesviewSceneCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo scenesviewSceneCommandParameterInfo =
         new CommandParameterInfo(
             "Scenes", ChipClusters.ScenesCluster.ViewSceneResponseCallback.class);
@@ -6660,7 +6516,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> softwareDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> softwareDiagnosticsresetWatermarksCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo softwareDiagnosticsresetWatermarksCommandParameterInfo =
         new CommandParameterInfo("SoftwareDiagnostics", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6690,7 +6545,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> tvChannelClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> tvChannelchangeChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelCommandParameterInfo =
         new CommandParameterInfo(
             "TvChannel", ChipClusters.TvChannelCluster.ChangeChannelResponseCallback.class);
@@ -6713,7 +6567,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     tvChannelClusterCommandInfoMap.put("changeChannel", tvChannelchangeChannelCommandInfo);
     Map<String, CommandParameterInfo> tvChannelchangeChannelByNumberCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo tvChannelchangeChannelByNumberCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelchangeChannelByNumbermajorNumberCommandParameterInfo =
@@ -6742,7 +6595,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "changeChannelByNumber", tvChannelchangeChannelByNumberCommandInfo);
     Map<String, CommandParameterInfo> tvChannelskipChannelCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo tvChannelskipChannelCommandParameterInfo =
         new CommandParameterInfo("TvChannel", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo tvChannelskipChannelcountCommandParameterInfo =
@@ -6769,7 +6621,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> targetNavigatorClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> targetNavigatornavigateTargetCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo targetNavigatornavigateTargetCommandParameterInfo =
         new CommandParameterInfo(
             "TargetNavigator",
@@ -6814,7 +6665,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> testClusterClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> testClustertestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -6828,7 +6678,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("test", testClustertestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestAddArgumentsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestAddArgumentsCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestAddArgumentsResponseCallback.class);
@@ -6858,7 +6707,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testAddArguments", testClustertestAddArgumentsCommandInfo);
     Map<String, CommandParameterInfo> testClustertestEnumsRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestEnumsRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestEnumsResponseCallback.class);
@@ -6888,7 +6736,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testEnumsRequest", testClustertestEnumsRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListInt8UArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListInt8UArgumentRequestarg1CommandParameterInfo =
@@ -6910,7 +6757,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UArgumentRequest", testClustertestListInt8UArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListInt8UReverseRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListInt8UReverseRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -6936,7 +6782,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListInt8UReverseRequest", testClustertestListInt8UReverseRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestListStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestListStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestListStructArgumentRequestaCommandParameterInfo =
@@ -6989,7 +6834,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testListStructArgumentRequest", testClustertestListStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNotHandledCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestNotHandledCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7004,7 +6848,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testNotHandled", testClustertestNotHandledCommandInfo);
     Map<String, CommandParameterInfo> testClustertestNullableOptionalRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestNullableOptionalRequestCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster",
@@ -7030,7 +6873,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testNullableOptionalRequest", testClustertestNullableOptionalRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestSpecificCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestSpecificCommandParameterInfo =
         new CommandParameterInfo(
             "TestCluster", ChipClusters.TestClusterCluster.TestSpecificResponseCallback.class);
@@ -7047,7 +6889,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     testClusterClusterCommandInfoMap.put("testSpecific", testClustertestSpecificCommandInfo);
     Map<String, CommandParameterInfo> testClustertestStructArgumentRequestCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestStructArgumentRequestCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo testClustertestStructArgumentRequestaCommandParameterInfo =
@@ -7100,7 +6941,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "testStructArgumentRequest", testClustertestStructArgumentRequestCommandInfo);
     Map<String, CommandParameterInfo> testClustertestUnknownCommandCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo testClustertestUnknownCommandCommandParameterInfo =
         new CommandParameterInfo("TestCluster", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7123,7 +6963,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> thermostatClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> thermostatclearWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo thermostatclearWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7139,7 +6978,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "clearWeeklySchedule", thermostatclearWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetRelayStatusLogCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo thermostatgetRelayStatusLogCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7155,7 +6993,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getRelayStatusLog", thermostatgetRelayStatusLogCommandInfo);
     Map<String, CommandParameterInfo> thermostatgetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo thermostatgetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatgetWeeklyScheduledaysToReturnCommandParameterInfo =
@@ -7184,7 +7021,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "getWeeklySchedule", thermostatgetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetWeeklyScheduleCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo thermostatsetWeeklyScheduleCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo
@@ -7228,7 +7064,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "setWeeklySchedule", thermostatsetWeeklyScheduleCommandInfo);
     Map<String, CommandParameterInfo> thermostatsetpointRaiseLowerCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo thermostatsetpointRaiseLowerCommandParameterInfo =
         new CommandParameterInfo("Thermostat", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo thermostatsetpointRaiseLowermodeCommandParameterInfo =
@@ -7274,7 +7109,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> threadNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> threadNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo threadNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "ThreadNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7305,7 +7139,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> wiFiNetworkDiagnosticsClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> wiFiNetworkDiagnosticsresetCountsCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo wiFiNetworkDiagnosticsresetCountsCommandParameterInfo =
         new CommandParameterInfo(
             "WiFiNetworkDiagnostics", ChipClusters.DefaultClusterCallback.class);
@@ -7329,7 +7162,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     Map<String, CommandInfo> windowCoveringClusterCommandInfoMap = new LinkedHashMap<>();
     Map<String, CommandParameterInfo> windowCoveringdownOrCloseCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringdownOrCloseCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7344,7 +7176,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringClusterCommandInfoMap.put("downOrClose", windowCoveringdownOrCloseCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftPercentageliftPercentageValueCommandParameterInfo =
@@ -7376,7 +7207,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftPercentage", windowCoveringgoToLiftPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToLiftValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToLiftValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToLiftValueliftValueCommandParameterInfo =
@@ -7399,7 +7229,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToLiftValue", windowCoveringgoToLiftValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltPercentageCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltPercentageCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltPercentagetiltPercentageValueCommandParameterInfo =
@@ -7431,7 +7260,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltPercentage", windowCoveringgoToTiltPercentageCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringgoToTiltValueCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringgoToTiltValueCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     CommandParameterInfo windowCoveringgoToTiltValuetiltValueCommandParameterInfo =
@@ -7454,7 +7282,6 @@ public Map<String, ClusterInfo> getClusterMap() {
         "goToTiltValue", windowCoveringgoToTiltValueCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringstopMotionCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringstopMotionCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands
@@ -7469,7 +7296,6 @@ public Map<String, ClusterInfo> getClusterMap() {
     windowCoveringClusterCommandInfoMap.put("stopMotion", windowCoveringstopMotionCommandInfo);
     Map<String, CommandParameterInfo> windowCoveringupOrOpenCommandParams =
         new LinkedHashMap<String, CommandParameterInfo>();
-    // TODO: fill out parameter types
     CommandParameterInfo windowCoveringupOrOpenCommandParameterInfo =
         new CommandParameterInfo("WindowCovering", ChipClusters.DefaultClusterCallback.class);
     // Populate commands

From 132a8283dd598c0be6d853b9cfeade58516356be Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 28 Oct 2021 17:10:50 -0400
Subject: [PATCH 35/38] fix comments

---
 .../ClusterDetailFragment.kt                  | 30 +++++--------------
 .../ClusterInteractionFragment.kt             | 10 ++-----
 .../clusterinteraction/EndpointAdapter.kt     |  2 +-
 .../app/src/main/res/layout/endpoint_item.xml |  4 +--
 src/controller/java/BUILD.gn                  |  2 +-
 5 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index 8a661f8990a048..bde27e0fe22a2d 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -7,9 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
 import androidx.fragment.app.Fragment
-import chip.clusterinfo.ClusterCommandCallback
-import chip.clusterinfo.ClusterInfo
-import chip.clusterinfo.CommandInfo
 import chip.devicecontroller.ChipDeviceController
 import com.google.chip.chiptool.ChipClient
 import com.google.chip.chiptool.GenericChipDeviceListener
@@ -19,6 +16,12 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 
+/**
+ * ClusterDetailFragment is the next displayed fragment after clicking on the list of available
+ * endpoints. ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
+ * the callback result.
+ */
+
 class ClusterDetailFragment : Fragment(){
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
@@ -31,7 +34,7 @@ class ClusterDetailFragment : Fragment(){
     savedInstanceState: Bundle?
   ): View {
     return inflater.inflate(R.layout.cluster_detail_fragment, container, false).apply {
-      deviceController.setCompletionListener(ChipControllerCallback())
+      deviceController.setCompletionListener(GenericChipDeviceListener())
     }
   }
 
@@ -41,25 +44,6 @@ class ClusterDetailFragment : Fragment(){
     }
   }
 
-  inner class ChipControllerCallback : GenericChipDeviceListener() {
-    override fun onConnectDeviceComplete() {}
-
-    override fun onCommissioningComplete(nodeId: Long, errorCode: Int) {
-    }
-
-    override fun onNotifyChipConnectionClosed() {
-      Log.d(TAG, "onNotifyChipConnectionClosed")
-    }
-
-    override fun onCloseBleComplete() {
-      Log.d(TAG, "onCloseBleComplete")
-    }
-
-    override fun onError(error: Throwable?) {
-      Log.d(TAG, "onError: $error")
-    }
-  }
-
   override fun onStop() {
     super.onStop()
     scope.cancel()
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 7564538dbafe05..2996c8eebd948a 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -29,9 +29,8 @@ class ClusterInteractionFragment : Fragment() {
 
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
-  private lateinit var clusterMap: HashMap<String, ClusterInfo>
+  private lateinit var clusterMap: Map<String, ClusterInfo>
   private var devicePtr = 0L
-  private val endpointId = 1
 
 
   override fun onCreateView(
@@ -41,9 +40,6 @@ class ClusterInteractionFragment : Fragment() {
   ): View {
     return inflater.inflate(R.layout.cluster_interaction_fragment, container, false).apply {
       deviceController.setCompletionListener(ChipControllerCallback())
-      if (devicePtr == 0L) {
-        endpointList.visibility = View.GONE
-      }
       getEndpoingListBtn.setOnClickListener {
         scope.launch {
           setDevicePtr()
@@ -54,11 +50,11 @@ class ClusterInteractionFragment : Fragment() {
 
       addressUpdateFragment =
         childFragmentManager.findFragmentById(R.id.addressUpdateFragment) as AddressUpdateFragment
-      clusterMap = ClusterInfoMapping().clusterMap as HashMap<String, ClusterInfo>;
+      clusterMap = ClusterInfoMapping().clusterMap
       var dataList: List<EndpointItem> = ArrayList()
       // TODO: Dynamically retrieve endpoint information using descriptor cluster
       // hardcode the endpoint for now
-      for (i in 0 until 19) {
+      for (i in 0 until 2) {
         dataList += EndpointItem(i)
       }
       endpointList.adapter = EndpointAdapter(dataList, EndpointListener())
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
index 5912574d156a52..05770a0614ec79 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -14,7 +14,7 @@ class EndpointAdapter(private val endpointList: List<EndpointItem>,
 ) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
 
   inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
-    val endpointId: TextView = itemView.findViewById(R.id.endpoint_id)
+    val endpointId: TextView = itemView.findViewById(R.id.endpointTv)
     init {
       itemView.setOnClickListener(this)
     }
diff --git a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
index bec6ea92d93c16..ac93ca48438924 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/endpoint_item.xml
@@ -12,21 +12,19 @@
       android:layout_margin="4dp">
 
     <TextView
-        android:id="@+id/endpoint_id"
+        android:id="@+id/endpointTv"
         android:textStyle="bold"
         android:width="100dp"
         android:height="70dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:text="endpoint 1"
         android:textColor="@android:color/black"
         android:textSize="18sp"
         android:background="@color/cardview_shadow_start_color"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
   </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index d0580b8c1d98f0..6bd724813d9ae8 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -81,4 +81,4 @@ android_library("java") {
 
 java_prebuilt("android") {
   jar_path = "${android_sdk_root}/platforms/android-21/android.jar"
-}
\ No newline at end of file
+}

From dc1f04277d76c8eac33075ade02529e51f8cd00e Mon Sep 17 00:00:00 2001
From: "Restyled.io" <commits@restyled.io>
Date: Thu, 28 Oct 2021 21:12:13 +0000
Subject: [PATCH 36/38] Restyled by whitespace

---
 .../java/src/chip/clusterinfo/ClusterCommandCallback.java       | 2 +-
 src/controller/java/src/chip/clusterinfo/ClusterInfo.java       | 2 +-
 src/controller/java/src/chip/clusterinfo/CommandInfo.java       | 2 +-
 .../java/src/chip/clusterinfo/CommandParameterInfo.java         | 2 +-
 .../java/src/chip/clusterinfo/DelegatedClusterCallback.java     | 2 +-
 src/controller/java/templates/templates.json                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
index 442340592f3925..f7cfef34e7b103 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterCommandCallback.java
@@ -9,4 +9,4 @@ public interface ClusterCommandCallback {
   void onSuccess(List<Object> responseValues);
 
   void onFailure(Exception exception);
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
index 817f355fe0a7f0..f90a9b8e409b1b 100644
--- a/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/ClusterInfo.java
@@ -30,4 +30,4 @@ public Map<String, CommandInfo> getCommands() {
   public interface ClusterConstructor {
     BaseChipCluster create(Long devicePtr, int endpointId);
   }
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/src/chip/clusterinfo/CommandInfo.java b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
index ff0a2f9335787f..7bc59c1571ff88 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandInfo.java
@@ -46,4 +46,4 @@ public interface ClusterCommandFunction {
     void invokeCommand(
         BaseChipCluster cluster, Object callback, Map<String, Object> commandArguments);
   }
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
index 8e67de57ec913e..f54987408f507b 100644
--- a/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
+++ b/src/controller/java/src/chip/clusterinfo/CommandParameterInfo.java
@@ -11,4 +11,4 @@ public CommandParameterInfo(String name, Class<?> type) {
 
   public String name;
   public Class<?> type;
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
index 12eb8f8fb4b334..e2f21cb6526041 100644
--- a/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
+++ b/src/controller/java/src/chip/clusterinfo/DelegatedClusterCallback.java
@@ -3,4 +3,4 @@
 /** Interface for a callback that delegates to {@link ClusterCommandCallback}. */
 public interface DelegatedClusterCallback {
   void setCallbackDelegate(ClusterCommandCallback callback);
-}
\ No newline at end of file
+}
diff --git a/src/controller/java/templates/templates.json b/src/controller/java/templates/templates.json
index f1504aaaad7a73..16bbc720ab17aa 100644
--- a/src/controller/java/templates/templates.json
+++ b/src/controller/java/templates/templates.json
@@ -42,4 +42,4 @@
             "output": "src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java"
         }
     ]
-}
\ No newline at end of file
+}

From e5ff0d5f114165d8a83f1b13a83310b311a79279 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Thu, 28 Oct 2021 18:26:16 -0400
Subject: [PATCH 37/38] resolve comments

---
 .../ClusterInteractionFragment.kt             | 16 +++++-------
 .../clusterinteraction/EndpointAdapter.kt     | 26 ++++++++++---------
 .../res/layout/cluster_detail_fragment.xml    |  9 -------
 .../layout/cluster_interaction_fragment.xml   |  4 +--
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index 2996c8eebd948a..eb19dd52bed748 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -20,7 +20,7 @@ import kotlinx.coroutines.cancel
 import chip.devicecontroller.ClusterInfoMapping
 import com.google.chip.chiptool.clusterclient.AddressUpdateFragment
 import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.endpointList
-import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getEndpoingListBtn
+import kotlinx.android.synthetic.main.cluster_interaction_fragment.view.getEndpointListBtn
 import kotlinx.coroutines.launch
 
 class ClusterInteractionFragment : Fragment() {
@@ -40,10 +40,11 @@ class ClusterInteractionFragment : Fragment() {
   ): View {
     return inflater.inflate(R.layout.cluster_interaction_fragment, container, false).apply {
       deviceController.setCompletionListener(ChipControllerCallback())
-      getEndpoingListBtn.setOnClickListener {
+      getEndpointListBtn.setOnClickListener {
         scope.launch {
-          setDevicePtr()
-          showMessage("Button Clicked")
+          devicePtr =
+            ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
+          showMessage("Retrieving endpoints")
           endpointList.visibility = View.VISIBLE
         }
       }
@@ -62,11 +63,6 @@ class ClusterInteractionFragment : Fragment() {
     }
   }
 
-  private suspend fun setDevicePtr() {
-    devicePtr =
-      ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
-  }
-
   private fun showMessage(msg: String) {
     requireActivity().runOnUiThread {
       Toast.makeText(requireContext(), msg, Toast.LENGTH_SHORT).show()
@@ -117,7 +113,7 @@ class ClusterInteractionFragment : Fragment() {
   inner class EndpointListener : EndpointAdapter.OnItemClickListener {
     override fun onItemClick(position: Int) {
       Toast.makeText(requireContext(), "Item $position clicked", Toast.LENGTH_SHORT).show()
-      showFragment(ClusterDetailFragment.newInstance(), true)
+      showFragment(ClusterDetailFragment.newInstance())
     }
   }
 }
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
index 05770a0614ec79..8f0c335e82966c 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -3,45 +3,47 @@ package com.google.chip.chiptool.clusterclient.clusterinteraction
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.google.chip.chiptool.R
 
-class EndpointAdapter(private val endpointList: List<EndpointItem>,
-                      private val listener: OnItemClickListener
+/**
+ * EndpointAdapter implements the endpointList(RecycleView) Adapter
+ */
+class EndpointAdapter(
+  private val endpointList: List<EndpointItem>,
+  private val listener: OnItemClickListener
 
 ) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
 
-  inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView), View.OnClickListener {
+  inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),
+                                                   View.OnClickListener {
     val endpointId: TextView = itemView.findViewById(R.id.endpointTv)
+
     init {
       itemView.setOnClickListener(this)
     }
 
-    override fun onClick(p0: View?) {
-      val position = adapterPosition
+    override fun onClick(endpointItem: View) {
+      val position = this.adapterPosition
       if (position != RecyclerView.NO_POSITION) {
         listener.onItemClick(position)
       }
     }
-
   }
 
   interface OnItemClickListener {
     fun onItemClick(position: Int)
   }
 
-
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EndpointViewHolder {
-    val itemView = LayoutInflater.from(parent.context).inflate(R.layout.endpoint_item, parent, false)
+    val itemView =
+      LayoutInflater.from(parent.context).inflate(R.layout.endpoint_item, parent, false)
     return EndpointViewHolder(itemView)
   }
 
   override fun onBindViewHolder(holder: EndpointViewHolder, position: Int) {
-    val currentItem = endpointList[position]
-
-    holder.endpointId.text = currentItem.endpointId.toString()
+    holder.endpointId.text = endpointList[position].endpointId.toString()
   }
 
   override fun getItemCount(): Int {
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
index bc388ee545091b..df7ab6283f1ef4 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_detail_fragment.xml
@@ -5,13 +5,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-  <TextView
-      android:id="@+id/textView"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="286dp"
-      android:layout_marginStart="147dp"
-      android:text="Testing"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
index 4acd02d876f7c9..2b50a2b988e526 100644
--- a/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
+++ b/src/android/CHIPTool/app/src/main/res/layout/cluster_interaction_fragment.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent">
 
   <Button
-      android:id="@+id/getEndpoingListBtn"
+      android:id="@+id/getEndpointListBtn"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="132dp"
@@ -29,6 +29,6 @@
       android:layout_height="wrap_content"
       android:clipToPadding="false"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@+id/getEndpoingListBtn" />
+      app:layout_constraintTop_toBottomOf="@+id/getEndpointListBtn" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 1c859a51b9a5b11f0a26b7d526e3fd1f80ede026 Mon Sep 17 00:00:00 2001
From: JasonLiuZhuoCheng <jasonlzc2017@gmail.com>
Date: Fri, 29 Oct 2021 13:46:26 -0400
Subject: [PATCH 38/38] fix comments

---
 .../clusterinteraction/ClusterDetailFragment.kt              | 5 +----
 .../clusterinteraction/ClusterInteractionFragment.kt         | 4 ----
 .../clusterclient/clusterinteraction/EndpointAdapter.kt      | 4 ++--
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
index bde27e0fe22a2d..b0c26054a00749 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterDetailFragment.kt
@@ -1,7 +1,6 @@
 package com.google.chip.chiptool.clusterclient.clusterinteraction
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,11 +16,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 
 /**
- * ClusterDetailFragment is the next displayed fragment after clicking on the list of available
- * endpoints. ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
+ * ClusterDetailFragment allows user to pick cluster, command, specify parameters and see
  * the callback result.
  */
-
 class ClusterDetailFragment : Fragment(){
   private val deviceController: ChipDeviceController
     get() = ChipClient.getDeviceController(requireContext())
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
index eb19dd52bed748..7bcd8cf5fc11b5 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/ClusterInteractionFragment.kt
@@ -30,8 +30,6 @@ class ClusterInteractionFragment : Fragment() {
   private val scope = CoroutineScope(Dispatchers.Main + Job())
   private lateinit var addressUpdateFragment: AddressUpdateFragment
   private lateinit var clusterMap: Map<String, ClusterInfo>
-  private var devicePtr = 0L
-
 
   override fun onCreateView(
     inflater: LayoutInflater,
@@ -42,8 +40,6 @@ class ClusterInteractionFragment : Fragment() {
       deviceController.setCompletionListener(ChipControllerCallback())
       getEndpointListBtn.setOnClickListener {
         scope.launch {
-          devicePtr =
-            ChipClient.getConnectedDevicePointer(requireContext(), addressUpdateFragment.deviceId)
           showMessage("Retrieving endpoints")
           endpointList.visibility = View.VISIBLE
         }
diff --git a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
index 8f0c335e82966c..104cc1e14e0544 100644
--- a/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
+++ b/src/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/clusterclient/clusterinteraction/EndpointAdapter.kt
@@ -8,12 +8,12 @@ import androidx.recyclerview.widget.RecyclerView
 import com.google.chip.chiptool.R
 
 /**
- * EndpointAdapter implements the endpointList(RecycleView) Adapter
+ * EndpointAdapter implements the endpointList(RecycleView) Adapter and associates different
+ * endpoint with the same onClick function provided in [ClusterInteractionFragment.EndpointListener]
  */
 class EndpointAdapter(
   private val endpointList: List<EndpointItem>,
   private val listener: OnItemClickListener
-
 ) : RecyclerView.Adapter<EndpointAdapter.EndpointViewHolder>() {
 
   inner class EndpointViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView),